Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: Migrated to Confluence 4.0

...

Wiki MarkupOutput from the plugin is prefixed with \ [PREINT\].

Code Block
[PREINT] Preparing environment using Pretested Integration Plugin 2.3.0-SNAPSHOT (cbd24)
[PREINT] Checking out integration branch master:
[PREINT]  git checkout -B master origin/master
[pretested-integration-plugin__demo-job-accumulated-strategy] $ git checkout -B master origin/master
[PREINT]  git pull origin master
[pretested-integration-plugin__demo-job-accumulated-strategy] $ git pull origin master
[PREINT] Preparing to merge changes in commit b1e190f90a8c1a22402af4492c70ae45eb32c981 on development branch origin/ready/feature-accumulated-32 to integration branch master
[PREINT] Collecting commit messages on development branch origin/ready/feature-accumulated-32
[PREINT] Done collecting commit messages
[PREINT] Collecting author of last commit on development branch
[PREINT] Done colecting last commit author: demo-job-user <support@praqma.net> 1435686815 +0200
[PREINT] Starting accumulated merge (no-ff) - without commit:
[PREINT]  git merge -m "Accumulated commit of the following from branch 'origin/ready/feature-accumulated-32':

commit b1e190f90a8c1a22402af4492c70ae45eb32c981
Author: demo-job-user <support@praqma.net>
Date:   Tue Jun 30 19:53:35 2015 +0200

    Demo commit message for Pretested Integration:

    This is a longer commit message about what this commit is about.

    We use this commit to illustrate the Prested Integration Plugin commit messages, based on their strategies. There are two demo jobs, one for each strategy and a job that does two commits, one on two different branches to be picked up as ready branches.


" b1e190f90a8c1a22402af4492c70ae45eb32c981 --no-ff --no-commit
[pretested-integration-plugin__demo-job-accumulated-strategy] $ git merge -m "Accumulated commit of the following from branch 'origin/ready/feature-accumulated-32':

commit b1e190f90a8c1a22402af4492c70ae45eb32c981
Author: demo-job-user <support@praqma.net>
Date:   Tue Jun 30 19:53:35 2015 +0200

    Demo commit message for Pretested Integration:

    This is a longer commit message about what this commit is about.

    We use this commit to illustrate the Prested Integration Plugin commit messages, based on their strategies. There are two demo jobs, one for each strategy and a job that does two commits, one on two different branches to be picked up as ready branches.


" b1e190f90a8c1a22402af4492c70ae45eb32c981 --no-ff --no-commit
[PREINT] Accumulated merge done
[PREINT] Merge was successful
[PREINT] Starting to commit accumulated merge changes:
[PREINT]  git commit --no-edit "--author=demo-job-user <support@praqma.net> 1435686815 +0200"
[pretested-integration-plugin__demo-job-accumulated-strategy] $ git commit --no-edit "--author=demo-job-user <support@praqma.net> 1435686815 +0200"
[PREINT] Commit of accumulated merge done
[PREINT] Commit was successful
[pretested-integration-plugin__demo-job-accumulated-strategy] $ /bin/sh -xe /tmp/hudson2956180739635715796.sh
+ echo Build and verification was successful
Build and verification was successful
[PREINT] Performing pre-verified post build steps
[PREINT] Pushing changes to integration branch:
[PREINT]  git push origin master
[pretested-integration-plugin__demo-job-accumulated-strategy] $ git push origin master
[PREINT] Done pushing changes
[PREINT] Deleting development branch:
[PREINT]  git push origin :ready/feature-accumulated-32
[pretested-integration-plugin__demo-job-accumulated-strategy] $ git push origin :ready/feature-accumulated-32
[PREINT] Done deleting development branch

...

Wiki MarkupOutput from the plugin is prefixed with \ [PREINT\].

Code Block
[PREINT] Preparing environment using Pretested Integration Plugin 2.3.0-SNAPSHOT
[PREINT] Checking out integration branch master:
[PREINT]  git checkout -B master origin/master
[pretested-integration-plugin__demo-job-squashed-strategy] $ git checkout -B master origin/master
[PREINT]  git pull origin master
[pretested-integration-plugin__demo-job-squashed-strategy] $ git pull origin master
[PREINT] Preparing to merge changes in commit 26576c087d13a50179a13054cc6edac603271abd on development branch origin/ready/feature-squashed-32 to integration branch master
[PREINT] Collecting commit messages on development branch (for debug printing): origin/ready/feature-squashed-32
[PREINT] Done collecting commit messages
[PREINT] Collecting author of last commit on development branch
[PREINT] Done colecting last commit author: demo-job-user <support@praqma.net> 1435686849 +0200
[PREINT] Starting squash merge - without commit:
[PREINT]  git merge --squash origin/ready/feature-squashed-32
[pretested-integration-plugin__demo-job-squashed-strategy] $ git merge --squash origin/ready/feature-squashed-32
[PREINT] Squash merge done
[PREINT] Merge was successful
[PREINT] Starting to commit squash merge changes:
[PREINT]  git commit --no-edit "--author=demo-job-user <support@praqma.net> 1435686849 +0200"
[pretested-integration-plugin__demo-job-squashed-strategy] $ git commit --no-edit "--author=demo-job-user <support@praqma.net> 1435686849 +0200"
[PREINT] Commit of squashed merge done
[PREINT] Commit was successful
[pretested-integration-plugin__demo-job-squashed-strategy] $ /bin/sh -xe /tmp/hudson3927922213950794742.sh
+ echo Build and verification was successful
Build and verification was successful
[PREINT] Performing pre-verified post build steps
[PREINT] Pushing changes to integration branch:
[PREINT]  git push origin master
[pretested-integration-plugin__demo-job-squashed-strategy] $ git push origin master
[PREINT] Done pushing changes
[PREINT] Deleting development branch:
[PREINT]  git push origin :ready/feature-squashed-32
[pretested-integration-plugin__demo-job-squashed-strategy] $ git push origin :ready/feature-squashed-32
[PREINT] Done deleting development branch

...

Jira Issues
columnstype;key;summary
width85%
anonymoustrue
titleOpen issues
urlhttp://issues.jenkins-ci.org/sr/jira.issueviews:searchrequest-xml/temp/SearchRequest.xml?jqlQuery=project+%3D+JENKINS+AND+status+in+%28Open%2C+%22In+Progress%22%2C"In+Progress"%2C+Reopened%29+AND+component+%3D+%27pretested-integration-plugin%27

...