diff options
Diffstat (limited to 'jjb/compass4nfv/compass4nfv.yml')
| -rw-r--r--[-rwxr-xr-x] | jjb/compass4nfv/compass4nfv.yml | 130 |
1 files changed, 38 insertions, 92 deletions
diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml index 5b6336681..468c06252 100755..100644 --- a/jjb/compass4nfv/compass4nfv.yml +++ b/jjb/compass4nfv/compass4nfv.yml @@ -8,7 +8,6 @@ jobs: - 'compass-verify' - 'compass-verify-on-ericsson-node' - - 'compass-upload-iso' - 'compass-merge' - 'compass-daily-{stream}' - 'compass-build' @@ -22,10 +21,10 @@ flavor: - five: - conf: 'five' + conf: 'virtual_five' node: 'huawei-build' - cluster: - conf: 'cluster' + conf: 'virtual_cluster' node: 'huawei-build' @@ -36,38 +35,11 @@ # job templates ######################## - job-template: - name: 'compass-upload-iso' - project-type: freestyle - disabled: false - - node: master - - logrotate: - daysToKeep: 30 - numToKeep: 10 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - parameters: - - project-parameter: - project: '{project}' - - compass-parameter: - installer: '{installer}' - - wrappers: - - ssh-agent-credentials: - user: '{ssh-credentials}' - - builders: - - 'compass-copy-artifact' - - 'compass-upload-artifact' - -- job-template: name: 'compass-verify-on-ericsson-node' project-type: freestyle - disabled: false + disabled: true node: ericsson-build @@ -116,7 +88,7 @@ builders: - 'compass-build' - + - 'compass-workspace-cleanup' - job-template: name: 'compass-verify' @@ -140,7 +112,10 @@ branch: 'master' - compass-parameter: installer: '{installer}' - + - string: + name: FLAVOR_CONF + default: 'virtual_cluster' + description: "" scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' @@ -172,7 +147,7 @@ builders: - 'compass-build' - #- 'compass-workspace-cleanup' + #- 'compass-deploy-virtual-flavor' - job-template: name: 'compass-merge' @@ -198,6 +173,7 @@ branch: 'master' - compass-parameter: installer: '{installer}' + scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' @@ -261,7 +237,7 @@ publishers: - trigger: - project: 'compass-deploy-virtual-five' + project: 'compass-build' threshold: SUCCESS - trigger: project: 'compass-deploy-virtual-cluster' @@ -272,7 +248,7 @@ project-type: freestyle - node: huawei-build + node: ericsson-build logrotate: daysToKeep: 30 @@ -294,17 +270,9 @@ builders: - 'compass-build' + - 'compass-upload-artifact' - 'compass-workspace-cleanup' - publishers: - - archive: - artifacts: '$BUILD_DIRECTORY/*.*' - allow-empty: 'true' - fingerprint: true - - trigger: - project: 'compass-upload-iso' - threshold: SUCCESS - - job-template: name: 'compass-deploy-virtual-{flavor}' @@ -335,6 +303,7 @@ builders: - 'compass-ci-preclean-workspace' + - 'compass-download-artifact' - 'compass-deploy-virtual-flavor' ######################## @@ -349,11 +318,11 @@ description: "Installer to use." - string: name: BUILD_DIRECTORY - default: build_output + default: $WORKSPACE/build_output description: "Directory where the build artifact will be located upon the completion of the build." - string: name: CACHE_DIRECTORY - default: $HOME/opnfv/cache/$INSTALLER + default: $HOME/opnfv/cache/$PROJECT description: "Directory where the cache to be used during the build is located." - string: name: GIT_BASE @@ -361,29 +330,22 @@ description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW." - string: name: GS_URL - default: artifacts.opnfv.org/$PROJECT/$INSTALLER + default: artifacts.opnfv.org/$PROJECT/ description: "URL to Google Storage." - string: - name: INTERNAL_REPO + name: GS_URL_PROXY + 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" + + ######################## # builder macros ######################## - builder: - name: compass-copy-artifact - builders: - - copyartifact: - project: "compass-build" - filter: "$BUILD_DIRECTORY/compass.iso, $BUILD_DIRECTORY/opnfv.properties" - target: ./ - which-build: upstream-build - optional: true - flatten: true - parameter-filters: PUBLISH=true - - -- builder: name: compass-merge builders: - shell: | @@ -391,6 +353,7 @@ echo "Hello World!" + - builder: name: 'compass-build' builders: @@ -407,18 +370,17 @@ # create the cache directory if it doesn't exist [[ -d $CACHE_DIRECTORY ]] || mkdir -p $CACHE_DIRECTORY + [[ -d $BUILD_DIRECTORY ]] || mkdir -p $BUILD_DIRECTORY # set OPNFV_ARTIFACT_VERSION export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d_%H-%M-%S") # start the build - cd $WORKSPACE/ci - ./build.sh - mkdir $WORKSPACE/$BUILD_DIRECTORY - mv $WORKSPACE/ci/work/compass.iso $WORKSPACE/$BUILD_DIRECTORY/ + cd $WORKSPACE/ + ./build.sh --iso-dir $BUILD_DIRECTORY/ --iso-name compass.iso -c $CACHE_DIRECTORY # list the build artifacts - ls -al $WORKSPACE/$BUILD_DIRECTORY + ls -al $BUILD_DIRECTORY # save information regarding artifact into file ( @@ -426,27 +388,14 @@ echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)" echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)" echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" - echo "OPNFV_ARTIFACT_MD5SUM=$(md5sum $WORKSPACE/$BUILD_DIRECTORY/compass.iso | cut -d' ' -f1)" + echo "OPNFV_ARTIFACT_MD5SUM=$(md5sum $BUILD_DIRECTORY/compass.iso | cut -d' ' -f1)" echo "OPNFV_BUILD_URL=$BUILD_URL" - ) > $WORKSPACE/$BUILD_DIRECTORY/opnfv.properties - + ) > $BUILD_DIRECTORY/opnfv.properties echo echo "--------------------------------------------------------" echo "Done!" - builder: - name: 'compass-deploy' - builders: - - shell: | - #!/bin/bash - set -o errexit - set -o nounset - set -o pipefail - - # log info to console - echo "Hello world!" - -- builder: name: 'compass-deploy-virtual-flavor' builders: - shell: | @@ -460,9 +409,9 @@ echo "--------------------------------------------------------" echo + export ISO_URL=file://$BUILD_DIRECTORY/compass.iso cd $WORKSPACE - ./ci/deploy.sh $FLAVOR_CONF - # ssh -o BatchMode=yes -o TCPKeepAlive=yes cideploy@10.118.34.205 ./cideploy.sh + ./deploy.sh $FLAVOR_CONF echo echo "--------------------------------------------------------" @@ -483,16 +432,13 @@ echo # source the opnfv.properties to get ARTIFACT_VERSION - source $WORKSPACE/opnfv.properties - - scp $WORKSPACE/compass.iso $INTERNAL_REPO/ - scp $WORKSPACE/opnfv.properties $INTERNAL_REPO/ - scp $WORKSPACE/compass.iso $INTERNAL_REPO/opnfv-$OPNFV_ARTIFACT_VERSION.iso + source $BUILD_DIRECTORY/opnfv.properties # upload artifact and additional files to google storage - gsutil cp $WORKSPACE/compass.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > 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 + gsutil cp $BUILD_DIRECTORY/compass.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1 + gsutil cp $BUILD_DIRECTORY/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1 + gsutil cp $BUILD_DIRECTORY/opnfv.properties gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1 + echo echo "--------------------------------------------------------" |