diff options
Diffstat (limited to 'jjb')
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 9 | ||||
| -rw-r--r-- | jjb/xci/xci-daily-jobs.yaml | 8 | ||||
| -rw-r--r-- | jjb/xci/xci-merge-jobs.yaml | 8 | ||||
| -rw-r--r-- | jjb/xci/xci-verify-jobs.yaml | 8 |
4 files changed, 24 insertions, 9 deletions
diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index a4b40f44f..433061a96 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/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 @@ -142,6 +142,9 @@ name: XCI_DISTRO default: '{distro}' - string: + name: FUNCTEST_VERSION + default: 'hunter' + - string: name: FUNCTEST_MODE default: 'tier' - string: @@ -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 @@ -268,6 +273,9 @@ name: SLAVE_LABEL default: '{slave-label}' - string: + name: FUNCTEST_VERSION + default: 'hunter' + - string: name: FUNCTEST_MODE default: 'tier' - string: 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 @@ -256,6 +256,9 @@ name: CI_LOOP default: 'merge' - string: + name: FUNCTEST_VERSION + default: 'hunter' + - string: name: FUNCTEST_MODE default: 'tier' - string: @@ -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 @@ -361,6 +366,9 @@ name: CI_LOOP default: 'merge' - string: + name: FUNCTEST_VERSION + default: 'hunter' + - string: name: FUNCTEST_MODE default: 'tier' - string: 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 @@ -150,6 +150,9 @@ name: CI_LOOP default: 'verify' - string: + name: FUNCTEST_VERSION + default: 'hunter' + - string: name: FUNCTEST_MODE default: 'tier' - string: @@ -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 @@ -251,6 +256,9 @@ name: CI_LOOP default: 'verify' - string: + name: FUNCTEST_VERSION + default: 'hunter' + - string: name: FUNCTEST_MODE default: 'tier' - string: |