diff options
| -rw-r--r-- | jjb/compass4nfv/compass4nfv.yml | 44 |
1 files changed, 17 insertions, 27 deletions
diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml index 226b3357d..5d0a5cbbc 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' + 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 "--------------------------------------------------------" |