diff options
| -rw-r--r-- | jjb/armband/armband-verify-jobs.yaml | 2 | ||||
| -rwxr-xr-x | jjb/fuel/fuel-deploy.sh | 9 | ||||
| -rw-r--r-- | jjb/fuel/fuel-verify-jobs.yaml | 2 | ||||
| -rw-r--r-- | jjb/releng/releng-release-tagging.sh | 2 |
4 files changed, 12 insertions, 3 deletions
diff --git a/jjb/armband/armband-verify-jobs.yaml b/jjb/armband/armband-verify-jobs.yaml index 08cf3c084..6f0016348 100644 --- a/jjb/armband/armband-verify-jobs.yaml +++ b/jjb/armband/armband-verify-jobs.yaml @@ -119,7 +119,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: false + node-parameters: true kill-phase-on: FAILURE abort-all-job: true diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh index 433061a96..a4b40f44f 100755 --- a/jjb/fuel/fuel-deploy.sh +++ b/jjb/fuel/fuel-deploy.sh @@ -111,6 +111,15 @@ 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/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml index bef6a5094..f48822d7f 100644 --- a/jjb/fuel/fuel-verify-jobs.yaml +++ b/jjb/fuel/fuel-verify-jobs.yaml @@ -119,7 +119,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE - node-parameters: false + node-parameters: true kill-phase-on: FAILURE abort-all-job: true diff --git a/jjb/releng/releng-release-tagging.sh b/jjb/releng/releng-release-tagging.sh index e1b93518f..f8cf9c8ea 100644 --- a/jjb/releng/releng-release-tagging.sh +++ b/jjb/releng/releng-release-tagging.sh @@ -34,7 +34,7 @@ for release_file in $RELEASE_FILES; do echo "$tag does not exist" TAG_EXISTS=false else - git cat-file tag $tag + git cat-file commit $tag TAG_EXISTS=true fi |