diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/apex/apex.yaml | 2 | ||||
| -rw-r--r-- | jjb/apex/apex.yaml.j2 | 2 | ||||
| -rw-r--r-- | jjb/auto/auto.yaml | 13 | ||||
| -rw-r--r-- | jjb/doctor/doctor.yaml | 14 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 3 | ||||
| -rwxr-xr-x | jjb/functest/functest-alpine.sh | 87 | ||||
| -rw-r--r-- | jjb/functest/functest-daily-jobs.yaml | 3 |
7 files changed, 109 insertions, 15 deletions
diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 33aec192e..7a9106e38 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -586,7 +586,7 @@ echo "DOCKER_TAG=hunter" > functest_scenario else functest_scenario=$DEPLOY_SCENARIO - DOCKER_TAG='' + echo "DOCKER_TAG=''" > functest_scenario fi echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario - inject: diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 281a09bf2..329d2c9f5 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -432,7 +432,7 @@ echo "DOCKER_TAG=hunter" > functest_scenario else functest_scenario=$DEPLOY_SCENARIO - DOCKER_TAG='' + echo "DOCKER_TAG=''" > functest_scenario fi echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario - inject: diff --git a/jjb/auto/auto.yaml b/jjb/auto/auto.yaml index 58838d6f4..abba9c8d3 100644 --- a/jjb/auto/auto.yaml +++ b/jjb/auto/auto.yaml @@ -12,7 +12,11 @@ branch: '{stream}' gs-pathname: '' disabled: false - - fraser: &fraser + - gambia: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + disabled: false + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -206,3 +210,10 @@ name: 'fuel-os-nosdn-onap-ha-auto-baremetal-fraser-trigger' triggers: - timed: '' +# --------------------------------------------------------------------- +# Auto CI Baremetal Triggers running against gambia branch +# --------------------------------------------------------------------- +- trigger: + name: 'fuel-os-nosdn-onap-ha-auto-baremetal-gambia-trigger' + triggers: + - timed: '' diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml index a79ffc947..5b4c4b06f 100644 --- a/jjb/doctor/doctor.yaml +++ b/jjb/doctor/doctor.yaml @@ -94,7 +94,11 @@ GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE kill-phase-on: FAILURE git-revision: true - - name: 'doctor-verify-maintenance-apex-sample-x86_64-{stream}' + - multijob: + name: 'doctor-verify-congress' + execution-type: PARALLEL + projects: + - name: 'doctor-verify-fault_management-apex-congress-x86_64-{stream}' predefined-parameters: | PROJECT=$PROJECT GERRIT_BRANCH=$GERRIT_BRANCH @@ -104,10 +108,10 @@ kill-phase-on: FAILURE git-revision: true - multijob: - name: 'doctor-verify-congress' + name: 'doctor-verify-sample-all' execution-type: PARALLEL projects: - - name: 'doctor-verify-fault_management-apex-congress-x86_64-{stream}' + - name: 'doctor-verify-all-apex-sample-x86_64-{stream}' predefined-parameters: | PROJECT=$PROJECT GERRIT_BRANCH=$GERRIT_BRANCH @@ -117,10 +121,6 @@ kill-phase-on: FAILURE git-revision: true - multijob: - name: 'doctor-verify-sample-all' - execution-type: PARALLEL - # This would be for running all test cases with sample inspector - - multijob: name: 'doctor-verify-congress-all' execution-type: PARALLEL # This would be for running all test cases with congress inspector diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index c0cdc3dc2..e66dbe1bd 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -19,6 +19,9 @@ 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 f0733b641..465d91efe 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -132,10 +132,6 @@ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no" -if [[ "${INSTALLER_TYPE}" == 'apex' ]] || [[ "${INSTALLER_TYPE}" == 'compass' ]]; then - envs="${envs} -e STORAGE_PROTOCOL=ceph" -fi - if [ "${INSTALLER_TYPE}" == 'fuel' ]; then COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \ "sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'") @@ -171,7 +167,88 @@ if [[ -n ${IMAGE_PROPERTIES} ]] || [[ -n ${FLAVOR_EXTRA_SPECS} ]]; then envs="${envs} -e IMAGE_PROPERTIES=${IMAGE_PROPERTIES} -e FLAVOR_EXTRA_SPECS=${FLAVOR_EXTRA_SPECS}" fi -volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol}" +tempest_conf_yaml=$(mktemp) +case ${INSTALLER_TYPE} in +apex) + cat << EOF > "${tempest_conf_yaml}" +--- +compute-feature-enabled: + shelve: false + vnc_console: true +identity-feature-enabled: + api_v2: false + api_v2_admin: false +image-feature-enabled: + api_v2: true + api_v1: false +volume: + storage_protocol: ceph +volume-feature-enabled: + backup: false +EOF + ;; +compass) + cat << EOF > "${tempest_conf_yaml}" +--- +compute-feature-enabled: + shelve: false + vnc_console: false + spice_console: true +identity-feature-enabled: + api_v2: false + api_v2_admin: false +image-feature-enabled: + api_v2: true + api_v1: false +volume: + storage_protocol: ceph +volume-feature-enabled: + backup: false +EOF + ;; +fuel) + cat << EOF > "${tempest_conf_yaml}" +--- +compute-feature-enabled: + shelve: false + vnc_console: false + spice_console: true +identity-feature-enabled: + api_v2: false + api_v2_admin: false +image-feature-enabled: + api_v2: true + api_v1: false +volume: + storage_protocol: iSCSI +volume-feature-enabled: + backup: false +EOF + ;; +*) + cat << EOF > "${tempest_conf_yaml}" +--- +compute-feature-enabled: + shelve: false + vnc_console: false +identity-feature-enabled: + api_v2: false + api_v2_admin: false +image-feature-enabled: + api_v2: true + api_v1: false +volume: + storage_protocol: iSCSI +volume-feature-enabled: + backup: false +EOF + ;; +esac +echo "tempest_conf.yaml:" && cat "${tempest_conf_yaml}" + +volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} \ + ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol} \ + -v ${tempest_conf_yaml}:/usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml" ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value" echo 0 > ${ret_val_file} diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 8d3883a0f..34aee8a9d 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -292,6 +292,9 @@ name: DEPLOY_SCENARIO default: 'os-nosdn-nofeature-noha' - string: + name: DOCKER_TAG + default: '' + - string: name: CLEAN_DOCKER_IMAGES default: 'false' description: 'Remove downloaded docker images (opnfv/functest*:*)' |