From: Trevor Bramwell Date: Tue, 18 Sep 2018 21:08:10 +0000 (+0000) Subject: Merge "[fuel] Accept arm clusters as valid deploy targets" X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=e59d12cec1800def7eac0025a1ba53bf17e4eeee;hp=966f369f5b6d32e72b4426dec6d5ae79abae32f2;p=releng.git Merge "[fuel] Accept arm clusters as valid deploy targets" --- diff --git a/jjb/container4nfv/container4nfv-arm64.yaml b/jjb/container4nfv/container4nfv-arm64.yaml index b66667471..069a5d25e 100644 --- a/jjb/container4nfv/container4nfv-arm64.yaml +++ b/jjb/container4nfv/container4nfv-arm64.yaml @@ -61,6 +61,14 @@ build-step-failure-threshold: 'never' failure-threshold: 'never' unstable-threshold: 'Failure' + - project: functest-compass-arm-virtual-daily-master + current-parameters: false + same-node: true + block: true + block-thresholds: + build-step-failure-threshold: 'never' + failure-threshold: 'never' + unstable-threshold: 'Failure' - project: container4nfv-k8-multus-nofeature-noha-{pod}-daily-{stream} current-parameters: true same-node: true diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index 85f2610a6..dace7fc7f 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -111,15 +111,6 @@ echo ${DEPLOY_COMMAND} exit_code=$? -# Temporary workaround for ericsson-virtual* PODs functest integration -# See https://jira.opnfv.org/browse/FUNCTEST-985 -# Set iptables rule to allow forwarding return traffic for container -redirect=/dev/stdout -if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || \ - ! sudo iptables -L FORWARD | awk 'NR==3' | grep RETURN 2> ${redirect}; then - sudo iptables -I FORWARD -j RETURN -fi - echo echo "--------------------------------------------------------" echo "Deployment is done!" diff --git a/jjb/functest/functest-alpine.sh b/jjb/functest/functest-alpine.sh index 357068e0c..4e23d44fe 100755 --- a/jjb/functest/functest-alpine.sh +++ b/jjb/functest/functest-alpine.sh @@ -61,11 +61,11 @@ run_test() { case ${test_name} in connection_check|tenantnetwork1|tenantnetwork2|vmready1|vmready2|singlevm1|singlevm2|vping_ssh|vping_userdata|cinder_test|odl|api_check|snaps_health_check) FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG} ;; - tempest_smoke|neutron-tempest-plugin-api|rally_sanity|refstack_defcore|patrole|snaps_smoke|neutron_trunk|networking-bgpvpn|networking-sfc|barbican) + tempest_smoke_serial|tempest_smoke|neutron-tempest-plugin-api|rally_sanity|refstack_defcore|patrole|snaps_smoke|neutron_trunk|networking-bgpvpn|networking-sfc|barbican) FUNCTEST_IMAGE=${REPO}/functest-smoke:${DOCKER_TAG} ;; shaker|vmtp) FUNCTEST_IMAGE=${REPO}/functest-benchmarking:${DOCKER_TAG} ;; - tempest_full|tempest_scenario|rally_full) + tempest_full_parallel|tempest_full|tempest_scenario|rally_full) FUNCTEST_IMAGE=${REPO}/functest-components:${DOCKER_TAG} ;; cloudify|cloudify_ims|heat_ims|vyos_vrouter|juju_epc) FUNCTEST_IMAGE=${REPO}/functest-vnf:${DOCKER_TAG} ;; diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml index 9262988e1..daed74ea3 100644 --- a/jjb/functest/functest-daily-jobs.yaml +++ b/jjb/functest/functest-daily-jobs.yaml @@ -78,6 +78,10 @@ slave-label: compass-virtual installer: compass <<: *master + - arm-virtual: + slave-label: compass-arm-virtual + installer: compass + <<: *master - baremetal: slave-label: compass-baremetal installer: compass @@ -86,6 +90,10 @@ slave-label: compass-virtual installer: compass <<: *fraser + - arm-virtual: + slave-label: compass-arm-virtual + installer: compass + <<: *fraser # apex CI PODs - virtual: slave-label: apex-virtual-master diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml index 65c9a2871..5b9ce413c 100644 --- a/jjb/global/slave-params.yaml +++ b/jjb/global/slave-params.yaml @@ -354,6 +354,17 @@ default: https://gerrit.opnfv.org/gerrit/$PROJECT description: 'Git URL to use on this Jenkins Slave' +- parameter: + name: 'compass-arm-virtual-defaults' + parameters: + - label: + name: SLAVE_LABEL + default: 'compass-arm-virtual' + - string: + name: GIT_BASE + default: https://gerrit.opnfv.org/gerrit/$PROJECT + description: 'Git URL to use on this Jenkins Slave' + - parameter: name: 'compass-virtual-master-defaults' parameters: diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml index c4689ba79..fcd4465cb 100644 --- a/jjb/xci/xci-daily-jobs.yaml +++ b/jjb/xci/xci-daily-jobs.yaml @@ -141,6 +141,9 @@ - string: name: XCI_DISTRO default: '{distro}' + - string: + name: FUNCTEST_VERSION + default: 'hunter' - string: name: FUNCTEST_MODE default: 'tier' @@ -173,6 +176,7 @@ XCI_FLAVOR=$XCI_FLAVOR CI_LOOP=$CI_LOOP XCI_DISTRO=$XCI_DISTRO + FUNCTEST_VERSION=$FUNCTEST_VERSION FUNCTEST_MODE=$FUNCTEST_MODE FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME same-node: true @@ -186,6 +190,7 @@ XCI_FLAVOR=$XCI_FLAVOR CI_LOOP=$CI_LOOP XCI_DISTRO=$XCI_DISTRO + FUNCTEST_VERSION=$FUNCTEST_VERSION FUNCTEST_MODE=$FUNCTEST_MODE FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME same-node: true @@ -267,6 +272,9 @@ - label: name: SLAVE_LABEL default: '{slave-label}' + - string: + name: FUNCTEST_VERSION + default: 'hunter' - string: name: FUNCTEST_MODE default: 'tier' diff --git a/jjb/xci/xci-merge-jobs.yaml b/jjb/xci/xci-merge-jobs.yaml index afa88a224..a499ec9be 100644 --- a/jjb/xci/xci-merge-jobs.yaml +++ b/jjb/xci/xci-merge-jobs.yaml @@ -255,6 +255,9 @@ - string: name: CI_LOOP default: 'merge' + - string: + name: FUNCTEST_VERSION + default: 'hunter' - string: name: FUNCTEST_MODE default: 'tier' @@ -292,6 +295,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE + FUNCTEST_VERSION=$FUNCTEST_VERSION FUNCTEST_MODE=$FUNCTEST_MODE FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME node-parameters: true @@ -312,6 +316,7 @@ GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE CI_LOOP=$CI_LOOP + FUNCTEST_VERSION=$FUNCTEST_VERSION FUNCTEST_MODE=$FUNCTEST_MODE FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME node-parameters: true @@ -360,6 +365,9 @@ - string: name: CI_LOOP default: 'merge' + - string: + name: FUNCTEST_VERSION + default: 'hunter' - string: name: FUNCTEST_MODE default: 'tier' diff --git a/jjb/xci/xci-verify-jobs.yaml b/jjb/xci/xci-verify-jobs.yaml index 020ec8bac..7d0f905b2 100644 --- a/jjb/xci/xci-verify-jobs.yaml +++ b/jjb/xci/xci-verify-jobs.yaml @@ -149,6 +149,9 @@ - string: name: CI_LOOP default: 'verify' + - string: + name: FUNCTEST_VERSION + default: 'hunter' - string: name: FUNCTEST_MODE default: 'tier' @@ -181,6 +184,7 @@ GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE CI_LOOP=$CI_LOOP + FUNCTEST_VERSION=$FUNCTEST_VERSION FUNCTEST_MODE=$FUNCTEST_MODE FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME node-parameters: true @@ -201,6 +205,7 @@ GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE CI_LOOP=$CI_LOOP + FUNCTEST_VERSION=$FUNCTEST_VERSION FUNCTEST_MODE=$FUNCTEST_MODE FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME node-parameters: true @@ -250,6 +255,9 @@ - string: name: CI_LOOP default: 'verify' + - string: + name: FUNCTEST_VERSION + default: 'hunter' - string: name: FUNCTEST_MODE default: 'tier' diff --git a/releases/gambia/functest.yaml b/releases/gambia/functest.yaml index 681778c65..f21aec0bb 100644 --- a/releases/gambia/functest.yaml +++ b/releases/gambia/functest.yaml @@ -6,10 +6,10 @@ release-model: stable branches: - name: stable/gambia location: - functest: e69190cc9b0763c9a72b654df56fb3ed5f27430f + functest: d5fce8c12bc73c1b1547df2750563c271a3ab3f6 - name: stable/gambia location: - functest-kubernetes: 951fc46b7499d9f230c6e8f0e1629ac2325c5ad7 + functest-kubernetes: ca3c9cf6f57c87aee8c6f0b93f70d84e3df736de - name: stable/gambia location: functest-xtesting: a09ece9bbe9cda52487cf5b443619fec1b3e09ca diff --git a/releases/hunter/functest.yaml b/releases/hunter/functest.yaml index 315b0de36..5fcc5c9c4 100644 --- a/releases/hunter/functest.yaml +++ b/releases/hunter/functest.yaml @@ -6,10 +6,10 @@ release-model: stable branches: - name: stable/hunter location: - functest: e69190cc9b0763c9a72b654df56fb3ed5f27430f + functest: d5fce8c12bc73c1b1547df2750563c271a3ab3f6 - name: stable/hunter location: - functest-kubernetes: 951fc46b7499d9f230c6e8f0e1629ac2325c5ad7 + functest-kubernetes: ca3c9cf6f57c87aee8c6f0b93f70d84e3df736de - name: stable/hunter location: functest-xtesting: a09ece9bbe9cda52487cf5b443619fec1b3e09ca