diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/apex/apex-deploy.sh | 2 | ||||
| -rwxr-xr-x | jjb/apex/apex-download-artifact.sh | 20 | ||||
| -rw-r--r-- | jjb/apex/apex.yml | 28 | ||||
| -rw-r--r-- | jjb/apex/apex.yml.j2 | 28 | ||||
| -rwxr-xr-x | jjb/xci/xci-promote.sh | 3 |
5 files changed, 43 insertions, 38 deletions
diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index 123db3e85..94d464259 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -121,7 +121,7 @@ if [[ "$JOB_NAME" =~ "virtual" ]]; then DEPLOY_CMD="${DEPLOY_CMD} -e csit-environment.yaml" fi if [[ "$PROMOTE" == "True" ]]; then - DEPLOY_CMD="${DEPLOY_CMD} --virtual-computes 2" + DEPLOY_CMD="${DEPLOY_CMD} --virtual-computes 1" fi else # settings for bare metal deployment diff --git a/jjb/apex/apex-download-artifact.sh b/jjb/apex/apex-download-artifact.sh index c12406cdb..066d61203 100755 --- a/jjb/apex/apex-download-artifact.sh +++ b/jjb/apex/apex-download-artifact.sh @@ -10,6 +10,26 @@ echo [[ -d $BUILD_DIRECTORY ]] || mkdir -p $BUILD_DIRECTORY +if [ -z "$DEPLOY_SCENARIO" ]; then + echo "Deploy scenario not set!" + exit 1 +elif [[ "$DEPLOY_SCENARIO" == *gate* ]]; then + echo "Detecting Gating scenario..." + if [ -z "$GERRIT_EVENT_COMMENT_TEXT" ]; then + echo "ERROR: Gate job triggered without comment!" + exit 1 + else + DEPLOY_SCENARIO=$(echo ${GERRIT_EVENT_COMMENT_TEXT} | grep start-gate-scenario | grep -Eo 'os-.*$') + if [ -z "$DEPLOY_SCENARIO" ]; then + echo "ERROR: Unable to detect scenario in Gerrit Comment!" + echo "Format of comment to trigger gate should be 'start-gate-scenario: <scenario>'" + exit 1 + else + echo "Gate scenario detected: ${DEPLOY_SCENARIO}" + fi + fi +fi + # if upstream we do not need to download anything if [[ "$DEPLOY_SCENARIO" =~ upstream ]]; then echo "Upstream deployment detected, skipping download artifact" diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml index e19a90e94..428835683 100644 --- a/jjb/apex/apex.yml +++ b/jjb/apex/apex.yml @@ -27,6 +27,7 @@ verify-scenario: 'os-odl-nofeature-ha' scenario_stream: 'master' disable_daily: false + disable_promote: false - euphrates: &euphrates branch: 'stable/euphrates' gs-pathname: '/euphrates' @@ -36,6 +37,7 @@ verify-scenario: 'os-odl-nofeature-ha' scenario_stream: 'euphrates' disable_daily: true + disable_promote: true - danube: &danube branch: 'stable/danube' gs-pathname: '/danube' @@ -46,6 +48,7 @@ scenario_stream: 'danube' disabled: true disable_daily: true + disable_promote: true scenario: - 'os-nosdn-nofeature-noha': @@ -181,6 +184,10 @@ - 'baremetal' - 'virtual' + os_version: + - 'pike' + - 'queens' + - 'master' - job-template: name: 'apex-runner-cperf-{stream}' @@ -691,7 +698,7 @@ # branch: branch (eg. stable) node: '{virtual-slave}' project-type: 'multijob' - disabled: false + disabled: '{disable_promote}' scm: - git-scm @@ -718,28 +725,13 @@ builders: - multijob: - name: build - condition: SUCCESSFUL - projects: - - name: 'apex-build-{stream}' - current-parameters: false - predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: true - git-revision: true - - multijob: name: deploy-virtual condition: SUCCESSFUL projects: - name: 'apex-deploy-virtual-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO=os-odl_l3-csit-noha + DEPLOY_SCENARIO=os-odl-{os_version}_upstream-noha OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -757,7 +749,7 @@ - name: 'functest-apex-virtual-suite-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO=os-odl_l3-nofeature-noha + DEPLOY_SCENARIO=os-odl-{os_version}_upstream-noha FUNCTEST_SUITE_NAME=tempest_smoke_serial GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2 index ecc6f270c..0bedd3560 100644 --- a/jjb/apex/apex.yml.j2 +++ b/jjb/apex/apex.yml.j2 @@ -27,6 +27,7 @@ verify-scenario: 'os-odl-nofeature-ha' scenario_stream: 'master' disable_daily: false + disable_promote: false - euphrates: &euphrates branch: 'stable/euphrates' gs-pathname: '/euphrates' @@ -36,6 +37,7 @@ verify-scenario: 'os-odl-nofeature-ha' scenario_stream: 'euphrates' disable_daily: true + disable_promote: true - danube: &danube branch: 'stable/danube' gs-pathname: '/danube' @@ -46,6 +48,7 @@ scenario_stream: 'danube' disabled: true disable_daily: true + disable_promote: true scenario: {%- for stream in scenarios %} @@ -59,6 +62,10 @@ - 'baremetal' - 'virtual' + os_version: + - 'pike' + - 'queens' + - 'master' - job-template: name: 'apex-runner-cperf-{stream}' @@ -569,7 +576,7 @@ # branch: branch (eg. stable) node: '{virtual-slave}' project-type: 'multijob' - disabled: false + disabled: '{disable_promote}' scm: - git-scm @@ -596,28 +603,13 @@ builders: - multijob: - name: build - condition: SUCCESSFUL - projects: - - name: 'apex-build-{stream}' - current-parameters: false - predefined-parameters: | - GERRIT_BRANCH=$GERRIT_BRANCH - GERRIT_REFSPEC=$GERRIT_REFSPEC - GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER - GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: false - kill-phase-on: FAILURE - abort-all-job: true - git-revision: true - - multijob: name: deploy-virtual condition: SUCCESSFUL projects: - name: 'apex-deploy-virtual-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO=os-odl_l3-csit-noha + DEPLOY_SCENARIO=os-odl-{os_version}_upstream-noha OPNFV_CLEAN=yes GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC @@ -635,7 +627,7 @@ - name: 'functest-apex-virtual-suite-{stream}' current-parameters: false predefined-parameters: | - DEPLOY_SCENARIO=os-odl_l3-nofeature-noha + DEPLOY_SCENARIO=os-odl-{os_version}_upstream-noha FUNCTEST_SUITE_NAME=tempest_smoke_serial GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC diff --git a/jjb/xci/xci-promote.sh b/jjb/xci/xci-promote.sh index 4e72dc8ab..d8d61bee2 100755 --- a/jjb/xci/xci-promote.sh +++ b/jjb/xci/xci-promote.sh @@ -39,7 +39,8 @@ echo "Storing promotion metadata as $REMOTE_PROMOTION_METADATA_FILE" gsutil cp $LOCAL_PROMOTION_METADATA_FILE $REMOTE_PROMOTION_METADATA_FILE > /dev/null 2>&1 # update the file metadata on gs to prevent the use of cached version of the file -gsutil -m setmeta -r -h "Cache-Control:private, max-age=0, no-transform" \ +gsutil -m setmeta -r -h "Content-Type:text/html" \ + -h "Cache-Control:private, max-age=0, no-transform" \ $REMOTE_PROMOTION_METADATA_FILE > /dev/null 2>&1 # log the metadata to console |