diff options
39 files changed, 444 insertions, 275 deletions
diff --git a/jjb/apex/apex-functest-scenario.sh b/jjb/apex/apex-functest-scenario.sh new file mode 100644 index 000000000..dcbed4479 --- /dev/null +++ b/jjb/apex/apex-functest-scenario.sh @@ -0,0 +1,18 @@ +#!/bin/bash +set -o errexit +set -o nounset +set -o pipefail + +features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p') +if [ "$features" == 'rocky' ]; then + functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-rocky-(noha|ha)/\1-nofeature-\2/p') + echo "DOCKER_TAG=hunter" > functest_scenario +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 + echo "DOCKER_TAG=$([[ ${BRANCH##*/} == "master" ]] && \ + echo "latest" || echo ${BRANCH##*/})" > functest_scenario +fi +echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml index 854aefc7f..15e68261a 100644 --- a/jjb/apex/apex-verify-jobs.yaml +++ b/jjb/apex/apex-verify-jobs.yaml @@ -354,13 +354,17 @@ abort-all-job: true git-revision: true - shell: | - if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then - echo 'REPO=opnfv' > functest_repo + 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 'REPO=ollivier' > functest_repo + echo "DOCKER_TAG=''" > functest_tag fi - inject: - properties-file: functest_repo + properties-file: functest_tag + override-build-parameters: true - multijob: name: functest-smoke condition: ALWAYS @@ -369,9 +373,9 @@ current-parameters: false predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG FUNCTEST_SUITE_NAME=tempest_smoke FUNCTEST_MODE=testcase - REPO=$REPO GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER diff --git a/jjb/apex/apex.yaml b/jjb/apex/apex.yaml index 15fab23c6..c7c938569 100644 --- a/jjb/apex/apex.yaml +++ b/jjb/apex/apex.yaml @@ -475,14 +475,6 @@ kill-phase-on: FAILURE abort-all-job: true git-revision: true - - shell: | - if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then - echo 'REPO=opnfv' > functest_repo - else - echo 'REPO=ollivier' > functest_repo - fi - - inject: - properties-file: functest_repo - multijob: name: functest-smoke condition: ALWAYS @@ -493,7 +485,6 @@ DEPLOY_SCENARIO=$DEPLOY_SCENARIO FUNCTEST_MODE=$FUNCTEST_MODE FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME - REPO=$REPO GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER @@ -585,23 +576,10 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - shell: | - if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then - echo 'REPO=opnfv' > functest_properties - else - echo 'REPO=ollivier' > functest_properties - fi - features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p') - if [ "$features" == 'queens' ]; then - functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-queens-(noha|ha)/\1-nofeature-\2/p') - elif [[ "$features" =~ 'queens' ]]; then - functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_queens-(noha|ha)/\1-\2-\3/p') - else - functest_scenario=$DEPLOY_SCENARIO - fi - echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_properties + - shell: + !include-raw-escape: ./apex-functest-scenario.sh - inject: - properties-file: functest_properties + properties-file: functest_scenario override-build-parameters: true - multijob: name: 'OPNFV Test Suite' @@ -610,8 +588,9 @@ - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' node-parameters: true current-parameters: false - predefined-parameters: + predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG kill-phase-on: NEVER abort-all-job: true git-revision: false @@ -652,6 +631,10 @@ name: DEPLOY_SCENARIO default: '{scenario}' description: "Scenario to deploy with." + - string: + name: DOCKER_TAG + default: '' + description: Default docker tag to pass to functest properties: - logrotate-default @@ -678,8 +661,9 @@ - name: 'functest-apex-baremetal-daily-{scenario_stream}' node-parameters: true current-parameters: false - predefined-parameters: + predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG kill-phase-on: NEVER abort-all-job: false git-revision: false @@ -885,7 +869,7 @@ description: "Used for overriding the PROMOTE" - string: name: GS_URL - default: 'gs://artifacts.opnfv.org/apex/{os_version}/{topology}' + default: 'artifacts.opnfv.org/apex/{os_version}/{topology}' description: "User for overriding GS_URL from apex params" - string: name: OS_VERSION @@ -1103,7 +1087,7 @@ project-type: 'multijob' - disabled: false + disabled: true node: 'flex-pod2' @@ -2032,12 +2016,12 @@ - trigger: name: 'master-master' triggers: - - timed: '0 12 * * *' + - timed: '0 5 * * *' - trigger: name: 'master-rocky' triggers: - - timed: '0 12 * * *' + - timed: '0 5 * * *' - trigger: name: 'master-queens' @@ -2057,7 +2041,7 @@ - trigger: name: 'gambia-queens' triggers: - - timed: '0 12 * * *' + - timed: '0 5 * * *' - trigger: name: 'fraser-master' diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2 index 5c934c44d..8edcc2742 100644 --- a/jjb/apex/apex.yaml.j2 +++ b/jjb/apex/apex.yaml.j2 @@ -321,14 +321,6 @@ kill-phase-on: FAILURE abort-all-job: true git-revision: true - - shell: | - if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then - echo 'REPO=opnfv' > functest_repo - else - echo 'REPO=ollivier' > functest_repo - fi - - inject: - properties-file: functest_repo - multijob: name: functest-smoke condition: ALWAYS @@ -339,7 +331,6 @@ DEPLOY_SCENARIO=$DEPLOY_SCENARIO FUNCTEST_MODE=$FUNCTEST_MODE FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME - REPO=$REPO GERRIT_BRANCH=$GERRIT_BRANCH GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER @@ -431,23 +422,10 @@ kill-phase-on: NEVER abort-all-job: true git-revision: false - - shell: | - if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then - echo 'REPO=opnfv' > functest_properties - else - echo 'REPO=ollivier' > functest_properties - fi - features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p') - if [ "$features" == 'queens' ]; then - functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-queens-(noha|ha)/\1-nofeature-\2/p') - elif [[ "$features" =~ 'queens' ]]; then - functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_queens-(noha|ha)/\1-\2-\3/p') - else - functest_scenario=$DEPLOY_SCENARIO - fi - echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_properties + - shell: + !include-raw-escape: ./apex-functest-scenario.sh - inject: - properties-file: functest_properties + properties-file: functest_scenario override-build-parameters: true - multijob: name: 'OPNFV Test Suite' @@ -456,8 +434,9 @@ - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}' node-parameters: true current-parameters: false - predefined-parameters: + predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG kill-phase-on: NEVER abort-all-job: true git-revision: false @@ -498,6 +477,10 @@ name: DEPLOY_SCENARIO default: '{scenario}' description: "Scenario to deploy with." + - string: + name: DOCKER_TAG + default: '' + description: Default docker tag to pass to functest properties: - logrotate-default @@ -524,8 +507,9 @@ - name: 'functest-apex-baremetal-daily-{scenario_stream}' node-parameters: true current-parameters: false - predefined-parameters: + predefined-parameters: | DEPLOY_SCENARIO=$DEPLOY_SCENARIO + DOCKER_TAG=$DOCKER_TAG kill-phase-on: NEVER abort-all-job: false git-revision: false @@ -731,7 +715,7 @@ description: "Used for overriding the PROMOTE" - string: name: GS_URL - default: 'gs://artifacts.opnfv.org/apex/{os_version}/{topology}' + default: 'artifacts.opnfv.org/apex/{os_version}/{topology}' description: "User for overriding GS_URL from apex params" - string: name: OS_VERSION @@ -949,7 +933,7 @@ project-type: 'multijob' - disabled: false + disabled: true node: 'flex-pod2' @@ -1214,12 +1198,12 @@ - trigger: name: 'master-master' triggers: - - timed: '0 12 * * *' + - timed: '0 5 * * *' - trigger: name: 'master-rocky' triggers: - - timed: '0 12 * * *' + - timed: '0 5 * * *' - trigger: name: 'master-queens' @@ -1239,7 +1223,7 @@ - trigger: name: 'gambia-queens' triggers: - - timed: '0 12 * * *' + - timed: '0 5 * * *' - trigger: name: 'fraser-master' 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/bottlenecks/bottlenecks-ci-jobs.yaml b/jjb/bottlenecks/bottlenecks-ci-jobs.yaml index 4c302dd52..0a48eedf5 100644 --- a/jjb/bottlenecks/bottlenecks-ci-jobs.yaml +++ b/jjb/bottlenecks/bottlenecks-ci-jobs.yaml @@ -19,8 +19,8 @@ gs-packagepath: '/{suite}' # docker tag used for version control docker-tag: 'latest' - fraser: &fraser - stream: fraser + gambia: &gambia + stream: gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' gs-packagepath: '/{stream}/{suite}' @@ -49,12 +49,12 @@ slave-label: compass-baremetal-branch installer: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *gambia - virtual: slave-label: compass-virtual-branch installer: compass auto-trigger-name: 'daily-trigger-disabled' - <<: *fraser + <<: *gambia # ------------------------------- # None-CI PODs diff --git a/jjb/bottlenecks/bottlenecks-project-jobs.yaml b/jjb/bottlenecks/bottlenecks-project-jobs.yaml index d4930d745..dac1659f8 100644 --- a/jjb/bottlenecks/bottlenecks-project-jobs.yaml +++ b/jjb/bottlenecks/bottlenecks-project-jobs.yaml @@ -21,7 +21,12 @@ # This is used for different test suite dependent packages storage gs-packagepath: '/{suite}' disabled: false - - fraser: &fraser + - gambia: + branch: 'stable/{stream}' + gs-pathname: '/{stream}' + gs-packagepath: '/{stream}/{suite}' + disabled: false + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' gs-packagepath: '/{stream}/{suite}' @@ -70,7 +75,6 @@ branch-pattern: '**/{branch}' builders: - # - bottlenecks-hello - bottlenecks-unit-tests - job-template: @@ -103,7 +107,6 @@ builders: - bottlenecks-hello - # - bottlenecks-unit-tests - job-template: name: 'bottlenecks-{suite}-upload-artifacts-{stream}' diff --git a/jjb/daisy4nfv/daisy-deploy.sh b/jjb/daisy4nfv/daisy-deploy.sh index ea57ab1b4..950b9be1f 100755 --- a/jjb/daisy4nfv/daisy-deploy.sh +++ b/jjb/daisy4nfv/daisy-deploy.sh @@ -17,7 +17,7 @@ if [[ ! "$NODE_NAME" =~ "-virtual" ]] && [[ ! "$LAB_NAME" =~ (zte) ]]; then exit $deploy_ret fi -# clone the securedlab repo +# clone the securedlab/pharos repo cd $WORKSPACE # There are no PDFs in euphrates branch of pharos repo. 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/dovetail/dovetail-ci-jobs.yaml b/jjb/dovetail/dovetail-ci-jobs.yaml index e3b87c7cb..89f402890 100644 --- a/jjb/dovetail/dovetail-ci-jobs.yaml +++ b/jjb/dovetail/dovetail-ci-jobs.yaml @@ -20,12 +20,19 @@ dovetail-branch: '{stream}' gs-pathname: '' docker-tag: 'latest' + disabled: true fraser: &fraser stream: fraser branch: 'stable/{stream}' dovetail-branch: 'stable/{stream}' gs-pathname: '/{stream}' docker-tag: 'ovp-2.0.0' + gambia: &gambia + stream: gambia + branch: 'stable/{stream}' + dovetail-branch: 'master' + gs-pathname: '/{stream}' + docker-tag: 'latest' # ---------------------------------- # POD, PLATFORM, AND BRANCH MAPPING @@ -81,6 +88,16 @@ SUT: compass auto-trigger-name: 'daily-trigger-disabled' <<: *fraser + - baremetal: + slave-label: compass-baremetal + SUT: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *gambia + - virtual: + slave-label: compass-virtual + SUT: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *gambia # ------------------------------- # Installers not using labels # CI PODs diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml index 936187ccb..7d90b0673 100644 --- a/jjb/fuel/fuel-daily-jobs.yaml +++ b/jjb/fuel/fuel-daily-jobs.yaml @@ -75,6 +75,8 @@ auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-odl-sfc-noha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' + - 'os-odl-bgpvpn-noha': + auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-ovn-nofeature-noha': auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger' - 'os-odl-ovs-noha': @@ -92,6 +94,8 @@ stream: fraser - scenario: os-odl-sfc-noha stream: fraser + - scenario: os-odl-bgpvpn-noha + stream: fraser - scenario: os-odl-ovs-noha stream: fraser - scenario: os-ovn-nofeature-noha @@ -394,6 +398,10 @@ triggers: - timed: '' - trigger: + name: 'fuel-os-odl-bgpvpn-noha-baremetal-daily-master-trigger' + triggers: + - timed: '' +- trigger: name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-master-trigger' triggers: - timed: '' @@ -447,6 +455,10 @@ triggers: - timed: '' - trigger: + name: 'fuel-os-odl-bgpvpn-noha-baremetal-daily-gambia-trigger' + triggers: + - timed: '' +- trigger: name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-gambia-trigger' triggers: - timed: '' @@ -499,6 +511,10 @@ triggers: - timed: '5 4 * * *' - trigger: + name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-master-trigger' + triggers: + - timed: '5 6 * * *' +- trigger: name: 'fuel-os-ovn-nofeature-noha-virtual-daily-master-trigger' triggers: - timed: '5 23 * * *' @@ -566,6 +582,10 @@ triggers: - timed: '0 4 * * *' - trigger: + name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-gambia-trigger' + triggers: + - timed: '0 7 * * *' +- trigger: name: 'fuel-os-ovn-nofeature-noha-virtual-daily-gambia-trigger' triggers: - timed: '0 23 * * *' @@ -618,6 +638,10 @@ triggers: - timed: '' - trigger: + name: 'fuel-os-odl-bgpvpn-noha-zte-pod1-daily-master-trigger' + triggers: + - timed: '' +- trigger: name: 'fuel-os-ovn-nofeature-noha-zte-pod1-daily-master-trigger' triggers: - timed: '' diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index c0cdc3dc2..8bc5fa268 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!" @@ -39,6 +42,9 @@ FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz" # Limited scope for vPOD verify jobs running on armband-virtual [[ ! "${JOB_NAME}" =~ verify-deploy-virtual-arm64 ]] || EXTRA_ARGS='-e' +# turn on DEBUG mode +[[ ${CI_DEBUG,,} == true ]] && EXTRA_ARGS="-D ${EXTRA_ARGS:-}" + # construct the command DEPLOY_COMMAND="${WORKSPACE}/ci/deploy.sh \ -l ${LAB_NAME} -p ${POD_NAME} -s ${DEPLOY_SCENARIO} \ diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index e8d81ea0c..42bf60b0a 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -8,6 +8,7 @@ REPO=${REPO:-opnfv} CI_LOOP=${CI_LOOP:-daily} TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results ENERGY_RECORDER_API_URL=http://energy.opnfv.fr/resources +DOCKER_TAG=${DOCKER_TAG:-$([[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/})} check_os_deployment() { FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} @@ -42,6 +43,7 @@ run_tiers() { echo ${ret_value} > ${ret_val_file} if [ ${tier} == 'healthcheck' ]; then echo "Healthcheck tier failed. Exiting Functest..." + skip_tests=1 break fi fi @@ -87,7 +89,6 @@ FUNCTEST_DIR=/home/opnfv/functest DEPLOY_TYPE=baremetal [[ $BUILD_TAG =~ "virtual" ]] && DEPLOY_TYPE=virt HOST_ARCH=$(uname -m) -DOCKER_TAG=`[[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/}` # Prepare OpenStack credentials volume rc_file=${HOME}/opnfv-openrc.sh @@ -131,7 +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}" == '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}'") @@ -154,6 +154,10 @@ if [[ ${INSTALLER_TYPE} == 'compass' && ${DEPLOY_SCENARIO} =~ 'sfc' ]]; then envs="${envs} -e EXTERNAL_NETWORK=${EXTERNAL_NETWORK}" fi +if [[ ${INSTALLER_TYPE} == 'compass' ]] || [[ ${DEPLOY_SCENARIO} == *"odl"* ]]; then + envs="${envs} -e SDN_CONTROLLER_RESTCONFPORT=8080" +fi + if [[ ${DEPLOY_SCENARIO} == *"ovs"* ]] || [[ ${DEPLOY_SCENARIO} == *"fdio"* ]]; then if [[ -n ${IMAGE_PROPERTIES} ]]; then IMAGE_PROPERTIES="${IMAGE_PROPERTIES},hw_mem_page_size:large" @@ -167,7 +171,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} @@ -183,6 +268,7 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then run_tiers ${tiers} else tests=(tempest_full tempest_scenario) + skip_tests=0 if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then if [[ ${BRANCH} == "stable/fraser" ]]; then tiers=(healthcheck smoke features vnf parser) @@ -199,7 +285,9 @@ else fi fi run_tiers ${tiers} - for test in "${tests[@]}"; do - run_test "$test" - done + if [ ${skip_tests} -eq 0 ]; then + for test in "${tests[@]}"; do + run_test "$test" + done + fi fi diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 3b3adabc2..34aee8a9d 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -102,6 +102,18 @@ slave-label: compass-arm-virtual installer: compass <<: *fraser + - baremetal: + slave-label: compass-baremetal + installer: compass + <<: *gambia + - virtual: + slave-label: compass-virtual + installer: compass + <<: *gambia + - arm-virtual: + slave-label: compass-arm-virtual + installer: compass + <<: *gambia # apex CI PODs - virtual: slave-label: apex-virtual-master @@ -280,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*:*)' diff --git a/jjb/functest/functest-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml index b7220a83c..e9a65b495 100644 --- a/jjb/functest/functest-project-jobs.yaml +++ b/jjb/functest/functest-project-jobs.yaml @@ -114,7 +114,7 @@ wrappers: - ssh-agent-wrapper - build-timeout: - timeout: 30 + timeout: 60 parameters: - project-parameter: diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml index 805673a0a..09a0d2287 100644 --- a/jjb/global/slave-params.yaml +++ b/jjb/global/slave-params.yaml @@ -572,7 +572,7 @@ parameters: - label: name: SLAVE_LABEL - default: 'pharos-dashboard' + default: 'pharos-dashboard2' description: 'Slave label on Jenkins' all-nodes: false node-eligibility: 'ignore-offline' diff --git a/jjb/joid/joid-daily-jobs.yaml b/jjb/joid/joid-daily-jobs.yaml index 46ba1d23f..1766d61ac 100644 --- a/jjb/joid/joid-daily-jobs.yaml +++ b/jjb/joid/joid-daily-jobs.yaml @@ -16,12 +16,12 @@ fraser: &fraser stream: fraser branch: 'stable/{stream}' - disabled: false + disabled: true gs-pathname: '/{stream}' master: &master stream: master branch: '{stream}' - disabled: false + disabled: true gs-pathname: '' # ------------------------------- # POD, INSTALLER, AND BRANCH MAPPING diff --git a/jjb/joid/joid-verify-jobs.yaml b/jjb/joid/joid-verify-jobs.yaml index 95ab0523f..d7cdec660 100644 --- a/jjb/joid/joid-verify-jobs.yaml +++ b/jjb/joid/joid-verify-jobs.yaml @@ -12,11 +12,11 @@ - master: branch: '{stream}' gs-pathname: '' - disabled: false + disabled: true - fraser: &fraser branch: 'stable/{stream}' gs-pathname: '/{stream}' - disabled: false + disabled: true ##################################### # patch verification phases ##################################### diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml index 1492a68ff..b4b85f6a0 100644 --- a/jjb/opnfvdocs/docs-rtd.yaml +++ b/jjb/opnfvdocs/docs-rtd.yaml @@ -8,12 +8,12 @@ stream: - master: branch: 'master' + - gambia: + branch: 'stable/{stream}' - fraser: branch: 'stable/{stream}' - danube: branch: 'stable/{stream}' - - euphrates: - branch: 'stable/{stream}' project: 'opnfvdocs' rtdproject: 'opnfv' @@ -86,7 +86,12 @@ builders: - shell: | if [ "$GERRIT_PROJECT" != "opnfvdocs" ]; then - cd docs/submodules/$GERRIT_PROJECT + # Temporary hacky solution to handle local builds for projects + # that already moved away from submodules + if ! cd docs/submodules/$GERRIT_PROJECT 2 > /dev/null; then + rm -rf .* * 2 > /dev/null + git clone ${{GIT_BASE/opnfvdocs/$GERRIT_PROJECT}} . + fi git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD cd - else diff --git a/jjb/opnfvdocs/opnfvdocs.yaml b/jjb/opnfvdocs/opnfvdocs.yaml index 5f08f69a4..a97457353 100644 --- a/jjb/opnfvdocs/opnfvdocs.yaml +++ b/jjb/opnfvdocs/opnfvdocs.yaml @@ -17,11 +17,11 @@ branch: '{stream}' gs-pathname: '' disabled: false - - fraser: &fraser + - gambia: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false - - euphrates: + - fraser: branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/pharos/pharos-tools.yml b/jjb/pharos/pharos-tools.yml new file mode 100644 index 000000000..ac5d1956e --- /dev/null +++ b/jjb/pharos/pharos-tools.yml @@ -0,0 +1,51 @@ +--- +- project: + name: pharos-dashboard-jobs + + project: 'pharos-tools' + + disabled: false + + jobs: + - '{project}-verify-basic' + - 'pharos-dashboard-backup' + - 'pharos-dashboard-deploy' + +- job-template: + name: 'pharos-dashboard-backup' + + disabled: '{obj:disabled}' + + parameters: + - 'pharos-dashboard-defaults' + + triggers: + - timed: '@daily' + + builders: + - shell: + !include-raw: shell/backup-dashboard.sh + +- job-template: + name: 'pharos-dashboard-deploy' + + disabled: '{obj:disabled}' + + parameters: + - project-parameter: + project: '{project}' + branch: 'master' + - 'pharos-dashboard-defaults' + + scm: + - git-scm-gerrit + + triggers: + - gerrit-trigger-change-merged: + branch: 'master' + project: '{project}' + files: 'dashboard/docker-compose.yml' + + builders: + - shell: + !include-raw: shell/deploy-dashboard.sh diff --git a/jjb/pharos/pharos.yaml b/jjb/pharos/pharos.yaml index c1bb1ba0e..0b5119657 100644 --- a/jjb/pharos/pharos.yaml +++ b/jjb/pharos/pharos.yaml @@ -4,85 +4,8 @@ project: - '{name}' - - '{name}-tools' disabled: false jobs: - '{project}-verify-basic' - - 'backup-pharos-dashboard' - - 'deploy-pharos-dashboard': - disabled: true - -- job-template: - name: 'backup-pharos-dashboard' - - disabled: '{obj:disabled}' - - parameters: - - 'pharos-dashboard-defaults' - - triggers: - - timed: '@daily' - - builders: - - shell: | - BACKUP_DIR=$HOME/backups/ - TMP_DIR=$HOME/tmp/ - mkdir -p $BACKUP_DIR - echo "-- $(date +%Y%m%d) --" - echo "Backing up Pharos Dashboard data..." - sudo docker run --rm \ - -v pharos-data:/pharos-data:ro \ - -v $TMP_DIR:/backup \ - alpine \ - tar -czf /backup/pharos-dashboard-db-$(date +%Y%m%d).tar.gz -C /pharos-data ./ - sudo mv $TMP_DIR/pharos-dashboard-db-$(date +%Y%m%d).tar.gz $BACKUP_DIR - sudo chown $USER:$USER $BACKUP_DIR/pharos-dashboard-db-$(date +%Y%m%d).tar.gz - echo "...complete" - -- job-template: - name: 'deploy-pharos-dashboard' - - disabled: '{obj:disabled}' - - parameters: - - project-parameter: - project: 'pharos-tools' - branch: 'master' - - 'pharos-dashboard-defaults' - - scm: - - git: - choosing-strategy: 'gerrit' - refspec: '$GERRIT_REFSPEC' - branches: - - 'origin/$BRANCH' - timeout: 15 - credentials-id: '$SSH_CREDENTIAL_ID' - url: '$GIT_BASE' - skip-tag: true - wipe-workspace: false - - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - ref-updated-event - - comment-added-contains-event: - comment-contains-value: '^redeploy$' - projects: - - project-compare-type: 'ANT' - project-pattern: 'pharos-tools' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/master' - - builders: - - shell: | - cp $HOME/config.env $WORKSPACE/dashboard - cp $HOME/rsa.pub $WORKSPACE/dashboard - cp $HOME/rsa.pem $WORKSPACE/dashboard - cd $WORKSPACE/dashboard - sudo docker-compose build - sudo docker-compose up -d diff --git a/jjb/pharos/shell/backup-dashboard.sh b/jjb/pharos/shell/backup-dashboard.sh new file mode 100644 index 000000000..4c1c01500 --- /dev/null +++ b/jjb/pharos/shell/backup-dashboard.sh @@ -0,0 +1,28 @@ +#!/bin/bash -eux +############################################################################## +# Copyright (c) 2018 Linux Foundation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +BACKUP_DIR=$HOME/backups +DATE=$(date +%Y%m%d) +TAR_FILE=pharos-dashboard-db-$DATE.tar.tz + +mkdir -p $BACKUP_DIR +echo "-- $DATE --" +echo "--> Backing up Pharos Dashboard" + +docker run --rm \ + -v pharos-data:/pharos-data:ro \ + -v $BACKUP_DIR:/backup \ + alpine \ + tar -czf /backup/$TAR_FILE -C /pharos-data ./ + +/usr/local/bin/gsutil cp $BACKUP_DIR/$TAR_FILE \ + gs://opnfv-backups/pharos-dashboard/ && rm $BACKUP_DIR/$TAR_FILE + +echo "--> Pharos dashboard backup complete" diff --git a/jjb/pharos/shell/deploy-dashboard.sh b/jjb/pharos/shell/deploy-dashboard.sh new file mode 100644 index 000000000..46a79c326 --- /dev/null +++ b/jjb/pharos/shell/deploy-dashboard.sh @@ -0,0 +1,19 @@ +#!/bin/bash -eux +############################################################################## +# Copyright (c) 2018 Linux Foundation and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## +cp $HOME/config.env $WORKSPACE/dashboard +cd $WORKSPACE/dashboard + +docker-compose pull +docker-compose up -d + +# Copy JIRA keys into web container +WEB_CONTAINER="$(docker ps --filter 'name=dg01' -q)" +docker cp $HOME/rsa.pub $WEB_CONTAINER:/pharos_dashboard/account/ +docker cp $HOME/rsa.pem $WEB_CONTAINER:/pharos_dashboard/account/ diff --git a/jjb/qtip/qtip-experimental-jobs.yaml b/jjb/qtip/qtip-experimental-jobs.yaml index 4e79c0553..9f72954a2 100644 --- a/jjb/qtip/qtip-experimental-jobs.yaml +++ b/jjb/qtip/qtip-experimental-jobs.yaml @@ -12,7 +12,7 @@ - master: branch: '{stream}' gs-pathname: '' - disabled: false + disabled: true pod: - zte-virtual5: diff --git a/jjb/qtip/qtip-validate-jobs.yaml b/jjb/qtip/qtip-validate-jobs.yaml index 0fc623c74..f7d66dfdd 100644 --- a/jjb/qtip/qtip-validate-jobs.yaml +++ b/jjb/qtip/qtip-validate-jobs.yaml @@ -14,11 +14,13 @@ branch: '{stream}' gs-pathname: '' docker-tag: latest + disabled: false fraser: &fraser stream: fraser branch: 'stable/{stream}' gs-pathname: '{stream}' docker-tag: 'stable' + disabled: false # ------------------------------- # JOB VARIABLES @@ -27,16 +29,19 @@ - compute: installer: apex pod: zte-virtual5 + disabled: true sut: node <<: *master - storage: installer: apex pod: zte-virtual5 + disabled: true sut: '' <<: *master - network: installer: apex pod: zte-virtual5 + disabled: true sut: '' <<: *master - compute: @@ -47,11 +52,13 @@ - compute: installer: apex pod: zte-virtual5 + disabled: true sut: node <<: *fraser - storage: installer: apex pod: zte-virtual5 + disabled: true sut: '' <<: *fraser - compute: @@ -72,7 +79,7 @@ ################################ - job-template: name: 'qtip-{qpi}-{installer}-{pod}-{stream}' - disabled: false + disabled: '{obj:disabled}' parameters: - project-parameter: diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml index 9bbcdfea7..da2916fe1 100644 --- a/jjb/releng/opnfv-docker.yaml +++ b/jjb/releng/opnfv-docker.yaml @@ -61,6 +61,11 @@ dockerdir: 'docker/barometer-collectd' <<: *master <<: *other-receivers + - 'barometer-dma': + project: 'barometer' + dockerdir: 'docker/barometer-dma' + <<: *master + <<: *other-receivers - 'barometer-grafana': project: 'barometer' dockerdir: 'docker/barometer-grafana' @@ -156,6 +161,24 @@ dockerfile: 'Dockerfile' <<: *master <<: *other-receivers + - 'clover-spark': + project: 'clover' + dockerdir: 'clover/spark/docker/clover-spark' + dockerfile: 'Dockerfile' + <<: *master + <<: *other-receivers + - 'clover-spark-submit': + project: 'clover' + dockerdir: 'clover/spark/docker/spark-submit' + dockerfile: 'Dockerfile' + <<: *master + <<: *other-receivers + - 'clover-clovisor': + project: 'clover' + dockerdir: 'clover/clovisor' + dockerfile: 'Dockerfile' + <<: *master + <<: *other-receivers - 'cperf': project: 'cperf' <<: *master diff --git a/jjb/releng/opnfv-utils.yaml b/jjb/releng/opnfv-utils.yaml index 457f7dc2b..05ffd51d9 100644 --- a/jjb/releng/opnfv-utils.yaml +++ b/jjb/releng/opnfv-utils.yaml @@ -168,6 +168,7 @@ sudo apt-get -y install ansible fi + - builder: name: run-ansible-build-server-playbook builders: diff --git a/jjb/securedlab/check-jinja2.yaml b/jjb/securedlab/check-jinja2.yaml deleted file mode 100644 index f7a7941dc..000000000 --- a/jjb/securedlab/check-jinja2.yaml +++ /dev/null @@ -1,85 +0,0 @@ ---- -######################## -# Job configuration to validate jinja2 files -######################## -- project: - - name: validate-templates - - project: 'securedlab' - - jobs: - - 'validate-jinja2-templates-{stream}' - - stream: - - master: - branch: '{stream}' - disabled: false - - fraser: - branch: 'stable/{stream}' - disabled: false - -######################## -# job templates -######################## - -- job-template: - name: 'validate-jinja2-templates-{stream}' - - disabled: '{obj:disabled}' - - concurrent: true - - parameters: - - project-parameter: - project: $GERRIT_PROJECT - branch: '{branch}' - - node: - name: SLAVE_NAME - description: Slave to execute jnija template test - default-slaves: - - lf-build1 - allowed-multiselect: true - ignore-offline-nodes: true - - scm: - - git-scm-gerrit - - triggers: - - gerrit: - server-name: 'gerrit.opnfv.org' - trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - draft-published-event - - comment-added-contains-event: - comment-contains-value: 'recheck' - - comment-added-contains-event: - comment-contains-value: 'reverify' - projects: - - project-compare-type: 'REG_EXP' - project-pattern: '{project}' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: '**/*.yaml' - - compare-type: ANT - pattern: 'check-jinja2.sh' - skip-vote: - successful: true - failed: true - unstable: true - notbuilt: true - - builders: - - check-jinja - -- builder: - name: check-jinja - builders: - - shell: | - $WORKSPACE/check-jinja2.sh diff --git a/jjb/storperf/storperf-daily-jobs.yaml b/jjb/storperf/storperf-daily-jobs.yaml index fe6aebb11..65e1d3232 100644 --- a/jjb/storperf/storperf-daily-jobs.yaml +++ b/jjb/storperf/storperf-daily-jobs.yaml @@ -15,8 +15,8 @@ branch: '{stream}' gs-pathname: '' docker-tag: 'latest' - fraser: &fraser - stream: fraser + gambia: &gambia + stream: gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false @@ -69,7 +69,7 @@ - baremetal: slave-label: apex-baremetal-master installer: apex - <<: *fraser + <<: *gambia ## armband CI PODs # - armband-baremetal: # slave-label: armband-baremetal diff --git a/jjb/storperf/storperf-verify-jobs.yaml b/jjb/storperf/storperf-verify-jobs.yaml index 4d6b1740a..2acedd7d4 100644 --- a/jjb/storperf/storperf-verify-jobs.yaml +++ b/jjb/storperf/storperf-verify-jobs.yaml @@ -13,7 +13,7 @@ gs-pathname: '' disabled: false docker-tag: 'latest' - - fraser: &fraser + - gambia: &gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/storperf/storperf.yaml b/jjb/storperf/storperf.yaml index fe5784777..993094c87 100644 --- a/jjb/storperf/storperf.yaml +++ b/jjb/storperf/storperf.yaml @@ -13,7 +13,7 @@ gs-pathname: '' disabled: false docker-tag: 'latest' - - fraser: &fraser + - gambia: &gambia branch: 'stable/{stream}' gs-pathname: '/{stream}' disabled: false diff --git a/jjb/yardstick/yardstick-daily-jobs.yaml b/jjb/yardstick/yardstick-daily-jobs.yaml index a312338a5..1c622acf2 100644 --- a/jjb/yardstick/yardstick-daily-jobs.yaml +++ b/jjb/yardstick/yardstick-daily-jobs.yaml @@ -161,6 +161,16 @@ installer: compass auto-trigger-name: 'daily-trigger-disabled' <<: *fraser + - baremetal: + slave-label: compass-baremetal + installer: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *gambia + - virtual: + slave-label: compass-virtual + installer: compass + auto-trigger-name: 'daily-trigger-disabled' + <<: *gambia # daisy CI PODs - baremetal: slave-label: daisy-baremetal diff --git a/releases/gambia/bottlenecks.yaml b/releases/gambia/bottlenecks.yaml new file mode 100644 index 000000000..d32d2073f --- /dev/null +++ b/releases/gambia/bottlenecks.yaml @@ -0,0 +1,9 @@ +--- +project: bottlenecks +project-type: testing +release-model: stable + +branches: + - name: stable/gambia + location: + bottlenecks: 399ec2f328f56c1f81c454ecedfb6b99eaf93c42 diff --git a/releases/gambia/functest.yaml b/releases/gambia/functest.yaml index f21aec0bb..722a35e70 100644 --- a/releases/gambia/functest.yaml +++ b/releases/gambia/functest.yaml @@ -3,6 +3,14 @@ project: functest project-type: testing release-model: stable +releases: + - version: opnfv-7.0.0 + location: + functest: b7f9b53a34cd8ffcc9df4d2f286e55e13adb4a58 + - version: opnfv-7.0.0 + location: + functest-kubernetes: fd5c939094244458aea31ead8c6519da95266c2a + branches: - name: stable/gambia location: diff --git a/releases/gambia/opnfvdocs.yaml b/releases/gambia/opnfvdocs.yaml new file mode 100644 index 000000000..b9cd04f4b --- /dev/null +++ b/releases/gambia/opnfvdocs.yaml @@ -0,0 +1,9 @@ +--- +project: opnfvdocs +project-type: infra +release-model: stable + +branches: + - name: stable/gambia + location: + opnfvdocs: c89a5b35e81cf085bba892b230ca4516a92ffd57 diff --git a/releases/hunter/functest.yaml b/releases/hunter/functest.yaml index 5fcc5c9c4..064ae056e 100644 --- a/releases/hunter/functest.yaml +++ b/releases/hunter/functest.yaml @@ -3,6 +3,14 @@ project: functest project-type: testing release-model: stable +releases: + - version: opnfv-8.0.0 + location: + functest: a3355e22585c66823c430d6adcdef8dddacb33a1 + - version: opnfv-8.0.0 + location: + functest-kubernetes: ec2bf0e8bd1b4d3b2c4e2894820d2cbb454e36e7 + branches: - name: stable/hunter location: diff --git a/utils/build-server-ansible/main.yml b/utils/build-server-ansible/main.yml index 1df8a0400..a4d3b08cb 100644 --- a/utils/build-server-ansible/main.yml +++ b/utils/build-server-ansible/main.yml @@ -41,6 +41,6 @@ when: ansible_distribution == "Ubuntu" - name: Install manifest-tool get_url: - url: '{{ manifest_tool_url }}/{{ manifest_tool_version }}/manifest-tool-linux-{{ facter_architecture }}' + url: '{{ manifest_tool_url }}/{{ manifest_tool_version }}/manifest-tool-linux-amd64' dest: '{{ manifest_tool_bin_dir }}/manifest-tool' mode: '755' diff --git a/utils/push-test-logs.sh b/utils/push-test-logs.sh index 075a62233..253cfa7b3 100644 --- a/utils/push-test-logs.sh +++ b/utils/push-test-logs.sh @@ -29,12 +29,11 @@ node_list=(\ 'ericsson-virtual4' 'ericsson-virtual5' \ 'arm-pod5' 'arm-pod6' \ 'huawei-pod1' 'huawei-pod2' 'huawei-pod3' 'huawei-pod4' \ -'huawei-pod6' 'huawei-pod7' 'huawei-pod12' \ +'huawei-pod6' 'huawei-pod7' 'huawei-pod12' 'huawei-pod8' \ 'huawei-virtual1' 'huawei-virtual2' 'huawei-virtual3' 'huawei-virtual4' \ 'huawei-virtual5' 'huawei-virtual8' 'huawei-virtual9' \ 'zte-pod2' 'zte-pod3' 'zte-pod9' \ -'zte-virtual1' \ -'arm-virtual3') +'zte-virtual1') if [[ ! " ${node_list[@]} " =~ " ${testbed} " ]]; then |