diff options
| -rw-r--r-- | jjb/apex/apex.yml | 8 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass4nfv.yml | 44 | ||||
| -rw-r--r-- | jjb/storperf/storperf.yml | 158 |
3 files changed, 182 insertions, 28 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index 65f042f50..e7f166a8a 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -249,6 +249,9 @@ echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)" echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" echo "OPNFV_ARTIFACT_MD5SUM=$(md5sum $BUILD_DIRECTORY/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso | cut -d' ' -f1)" + echo "OPNFV_SRPM_URL=$GS_URL/opnfv-apex-$(grep Version build/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-').src.rpm" + echo "OPNFV_RPM_URL=$GS_URL/opnfv-apex-$(grep Version build/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-').rpm" + echo "OPNFV_RPM_MD5SUM=$(md5sum $BUILD_DIRECTORY/$(grep Version build/opnfv-apex.spec | awk '{ print $2 }')-$(echo $OPNFV_ARTIFACT_VERSION | tr -d '_-').rpm)" echo "OPNFV_BUILD_URL=$BUILD_URL" ) > $WORKSPACE/opnfv.properties echo @@ -285,13 +288,16 @@ # upload artifact and additional files to google storage gsutil cp $BUILD_DIRECTORY/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1 + gsutil cp $BUILD_DIRECTORY/$(basename $OPNFV_RPM_URL) gs://$GS_URL/$(basename $OPNFV_RPM_URL) > gsutil.iso.log 2>&1 + gsutil cp $BUILD_DIRECTORY/$(basename $OPNFV_SRPM_URL) gs://$GS_URL/$(basename $OPNFV_SRPM_URL) > gsutil.iso.log 2>&1 gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1 gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1 echo echo "--------------------------------------------------------" echo "Done!" - echo "Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" + echo "ISO Artifact is available as http://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" + echo "RPM Artifact is available as http://$GS_URL/$(basename $OPNFV_RPM_URL)" ####################### diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml index 226b3357d..c76e5c8ad 100644 --- a/jjb/compass4nfv/compass4nfv.yml +++ b/jjb/compass4nfv/compass4nfv.yml @@ -209,6 +209,7 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/master' + builders: - 'builder-compass-merge' @@ -232,7 +233,7 @@ branch: '{branch}' triggers: - - pollscm: '@midnight' + - timed: '@midnight' logrotate: daysToKeep: 30 @@ -241,20 +242,14 @@ artifactNumToKeep: -1 builders: - #- 'builder-compass-build-iso' - #- 'builder-compass-upload-artifact' - #- 'builder-compass-workspace-cleanup' - - shell: | - echo "Hello world!" - echo "compass-deploy-virtual job will be triggered!" - - publishers: - - trigger: - project: 'compass-build-iso' - threshold: SUCCESS - - trigger: - project: 'compass-deploy-virtual-cluster' - threshold: SUCCESS + - trigger-builds: + - project: 'compass-build-iso' + git-revision: true + block: true + - trigger-builds: + - project: 'compass-deploy-virtual-cluster' + git-revision: true + block: true - job-template: name: 'compass-build-iso' @@ -338,8 +333,6 @@ default: '{conf}' description: "" - triggers: - - pollscm: "H/2 * * * *" logrotate: daysToKeep: 30 @@ -347,6 +340,7 @@ artifactDaysToKeep: -1 artifactNumToKeep: -1 + builders: - 'builder-compass-ci-preclean-workspace' - 'builder-compass-download-artifact' @@ -389,11 +383,6 @@ default: build.opnfv.org/artifacts/$PROJECT/ description: "URL to Google Storage proxy" - string: - name: INTERNAL_REPO_XA - default: "root@192.168.127.11:~/xh/work/build/work" - description: "Artifact Repository" - - - string: name: installer_ip default: "10.1.0.12" - string: @@ -550,19 +539,20 @@ echo # get the latest.properties file in order to get info regarding latest artifact - curl -s -o $WORKSPACE/latest.properties http://$GS_URL/latest.properties + [[ -d $BUILD_DIRECTORY ]] || mkdir -p $BUILD_DIRECTORY + curl -s -o $BUILD_DIRECTORY/latest.properties http://$GS_URL/latest.properties # check if we got the file - [[ -f latest.properties ]] || exit 1 + [[ -f $BUILD_DIRECTORY/latest.properties ]] || exit 1 # source the file so we get OPNFV vars - source latest.properties + source $BUILD_DIRECTORY/latest.properties # download the file - curl -s -o $WORKSPACE/compass.iso http://$OPNFV_ARTIFACT_URL > gsutil.iso.log 2>&1 + curl -s -o $BUILD_DIRECTORY/compass.iso http://$OPNFV_ARTIFACT_URL > gsutil.iso.log 2>&1 # list the file - ls -al $WORKSPACE/compass.iso + ls -al $BUILD_DIRECTORY/compass.iso echo echo "--------------------------------------------------------" diff --git a/jjb/storperf/storperf.yml b/jjb/storperf/storperf.yml new file mode 100644 index 000000000..595c663f7 --- /dev/null +++ b/jjb/storperf/storperf.yml @@ -0,0 +1,158 @@ +- project: + name: storperf + jobs: + - 'storperf-verify' + - 'storperf-merge' + - 'storperf-daily-{stream}' + + # stream: branch with - in place of / (eg. stable-arno) + # branch: branch (eg. stable/arno) + stream: + - master: + branch: 'master' + + project: 'storperf' + +- job-template: + name: 'storperf-verify' + + node: master + + project-type: freestyle + + logrotate: + daysToKeep: 30 + numToKeep: 10 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: 'master' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - ssh-agent-credentials: + user: '{ssh-credentials}' + + triggers: + - gerrit: + trigger-on: + - patchset-created-event: + exclude-drafts: 'false' + exclude-trivial-rebase: 'false' + exclude-no-code-change: 'false' + - draft-published-event + - comment-added-contains-event: + comment-contains-value: 'recheck' + - comment-added-contains-event: + comment-contains-value: 'reverify' + projects: + - project-compare-type: 'ANT' + project-pattern: 'storperf' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/master' + + builders: + - shell: + echo "Hello World" + +- job-template: + name: 'storperf-merge' + + # builder-merge job to run JJB update + # + # This job's purpose is to update all the JJB + + node: master + + project-type: freestyle + + logrotate: + daysToKeep: 30 + numToKeep: 40 + artifactDaysToKeep: -1 + artifactNumToKeep: 5 + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: 'master' + + scm: + - gerrit-trigger-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + choosing-strategy: 'default' + + wrappers: + - ssh-agent-credentials: + user: '{ssh-credentials}' + + triggers: + - gerrit: + trigger-on: + - change-merged-event + - comment-added-contains-event: + comment-contains-value: 'remerge' + projects: + - project-compare-type: 'ANT' + project-pattern: 'storperf' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/master' + + builders: + - shell: + echo "Hello World" + + +- job-template: + name: 'storperf-daily-{stream}' + + # Job template for daily builders + # + # Required Variables: + # stream: branch with - in place of / (eg. stable) + # branch: branch (eg. stable) + node: master + + disabled: true + + project-type: freestyle + + logrotate: + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + + scm: + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: '{branch}' + + wrappers: + - ssh-agent-credentials: + user: '{ssh-credentials}' + + triggers: + - timed: 'H H * * *' + + builders: + - shell: + echo "Hello World" |