summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--jjb/armband/armband-verify-jobs.yaml2
-rwxr-xr-xjjb/fuel/fuel-deploy.sh9
-rw-r--r--jjb/fuel/fuel-verify-jobs.yaml2
-rw-r--r--jjb/releng/releng-release-tagging.sh2
-rw-r--r--releases/fraser/compass4nfv.yaml7
-rw-r--r--releases/fraser/functest.yaml6
-rw-r--r--releases/fraser/samplevnf.yaml4
7 files changed, 29 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
diff --git a/releases/fraser/compass4nfv.yaml b/releases/fraser/compass4nfv.yaml
index c01ca9fc2..99f796230 100644
--- a/releases/fraser/compass4nfv.yaml
+++ b/releases/fraser/compass4nfv.yaml
@@ -4,6 +4,13 @@ project-type: installer
release-model: stable
releases:
+ - version: opnfv-6.2.0
+ location:
+ compass4nfv: c51e937d7a121f8a267f0522fb787adbfb1a7eb9
+ - version: opnfv-6.2.0
+ location:
+ compass-containers: 067a72e250f9eea8deed84348aef6681d305a160
+
- version: opnfv-6.1.0
location:
compass4nfv: 499d95cdea092ea9eb76a939b6ea832601d41b7f
diff --git a/releases/fraser/functest.yaml b/releases/fraser/functest.yaml
index e12758835..0466e6e86 100644
--- a/releases/fraser/functest.yaml
+++ b/releases/fraser/functest.yaml
@@ -16,6 +16,12 @@ releases:
- version: opnfv-6.1.0
location:
functest-kubernetes: c3e48ccef64acc6ba31823e1c8d6138eebbffb8c
+ - version: opnfv-6.2.0
+ location:
+ functest: f7948517b7cfabf8405e64eb4c2057c0105b852f
+ - version: opnfv-6.2.0
+ location:
+ functest-kubernetes: d1a1e7e92053d767e8322d17370a8700562b44a0
branches:
- name: stable/fraser
diff --git a/releases/fraser/samplevnf.yaml b/releases/fraser/samplevnf.yaml
index 984ca8c16..11728a736 100644
--- a/releases/fraser/samplevnf.yaml
+++ b/releases/fraser/samplevnf.yaml
@@ -10,6 +10,10 @@ releases:
- version: opnfv-6.1.0
location:
samplevnf: 95e9ab89f6d8f9911a9fdb625e8721f3d2e20b1a
+ - version: opnfv-6.2.0
+ location:
+ samplevnf: 692702c10772e13b533c908ed3f95a430ad476ce
+
branches:
- name: stable/fraser