diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex-functest-scenario.sh | 2 | ||||
| -rw-r--r-- | jjb/apex/apex-verify-jobs.yaml | 13 | ||||
| -rw-r--r-- | jjb/auto/auto.yaml | 3 | ||||
| -rw-r--r-- | jjb/ci_gate_security/opnfv-ci-gate-security.yaml | 2 | ||||
| -rwxr-xr-x | jjb/cperf/cperf-robot-netvirt-csit.sh | 1 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 3 | ||||
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 2 | ||||
| -rw-r--r-- | jjb/releng/opnfv-docker.yaml | 2 |
8 files changed, 11 insertions, 17 deletions
diff --git a/jjb/apex/apex-functest-scenario.sh b/jjb/apex/apex-functest-scenario.sh index dcbed4479..f1cb74e24 100644 --- a/jjb/apex/apex-functest-scenario.sh +++ b/jjb/apex/apex-functest-scenario.sh @@ -11,7 +11,7 @@ elif [[ "$features" =~ 'rocky' ]]; then functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_rocky-(noha|ha)/\1-\2-\3/p') echo "DOCKER_TAG=hunter" > functest_scenario else - functest_scenario=$DEPLOY_SCENARIO + functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/-(noha|ha).*/-\1/p') echo "DOCKER_TAG=$([[ ${BRANCH##*/} == "master" ]] && \ echo "latest" || echo ${BRANCH##*/})" > functest_scenario fi diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml index c10a7836e..23ce14f80 100644 --- a/jjb/apex/apex-verify-jobs.yaml +++ b/jjb/apex/apex-verify-jobs.yaml @@ -355,17 +355,10 @@ kill-phase-on: FAILURE abort-all-job: true git-revision: true - - shell: | - features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p') - if [ "$features" == 'rocky' ]; then - echo "DOCKER_TAG=hunter" > functest_tag - elif [[ "$features" =~ 'rocky' ]]; then - echo "DOCKER_TAG=hunter" > functest_tag - else - echo "DOCKER_TAG=''" > functest_tag - fi + - shell: + !include-raw-escape: ./apex-functest-scenario.sh - inject: - properties-file: functest_tag + properties-file: functest_scenario override-build-parameters: true - multijob: name: functest-smoke diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml index ccf723f01..84bb6141c 100644 --- a/jjb/auto/auto.yaml +++ b/jjb/auto/auto.yaml @@ -120,6 +120,9 @@ branch: '{branch}' - 'intel-pod18-defaults' + scm: + - git-scm + triggers: - timed: '0 16 * * *' diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml index 365afdd30..4c69d6198 100644 --- a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml +++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml @@ -91,7 +91,7 @@ disabled: '{obj:disabled}' parameters: - - ericsson-build3-defaults + - opnfv-build-defaults - string: name: ANTEATER_SCAN_PATCHSET default: "false" diff --git a/jjb/cperf/cperf-robot-netvirt-csit.sh b/jjb/cperf/cperf-robot-netvirt-csit.sh index c30f10ae3..eac1316a5 100755 --- a/jjb/cperf/cperf-robot-netvirt-csit.sh +++ b/jjb/cperf/cperf-robot-netvirt-csit.sh @@ -102,6 +102,7 @@ robot_cmd="pybot \ -d $LOGS_LOCATION \ -v BUNDLEFOLDER:/opt/opendaylight \ -v CONTROLLER_USER:heat-admin \ + -v CMP_INSTANCES_SHARED_PATH:/var/lib/nova/instances/ \ -v DEFAULT_LINUX_PROMPT:\$ \ -v DEFAULT_LINUX_PROMPT_STRICT:]\$ \ -v DEFAULT_USER:heat-admin \ diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index 8bc5fa268..418b814e5 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -19,9 +19,6 @@ LAB_NAME=${NODE_NAME/-*} # shellcheck disable=SC2153 POD_NAME=${NODE_NAME/*-} -# define Docker tag for stable branches -[[ "${BRANCH}" != master ]] && export MCP_DOCKER_TAG=${BRANCH##*/} - # Fuel currently supports arm, enea, ericsson, intel, lf, unh and zte labs if [[ ! "${LAB_NAME}" =~ (arm|enea|ericsson|intel|lf|unh|zte) ]]; then echo "Unsupported/unidentified lab ${LAB_NAME}. Cannot continue!" diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 42bf60b0a..91ca5eb88 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -98,7 +98,7 @@ if [[ ${INSTALLER_TYPE} == 'joid' ]]; then elif [[ ${INSTALLER_TYPE} == 'compass' ]]; then cacert_file_vol="-v ${HOME}/os_cacert:${FUNCTEST_DIR}/conf/os_cacert" echo "export OS_CACERT=${FUNCTEST_DIR}/conf/os_cacert" >> ${HOME}/opnfv-openrc.sh -elif [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_TYPE} == 'baremetal' ]]; then +elif [[ ${INSTALLER_TYPE} == 'fuel' ]] && [[ "${DEPLOY_SCENARIO}" =~ -ha$ ]]; then cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert" fi diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index 17235b37d..1f7366688 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -302,7 +302,7 @@ <<: *other-receivers - 'bottlenecks': project: 'bottlenecks' - <<: *euphrates + <<: *gambia <<: *other-receivers - 'nfvbench': project: 'nfvbench' |