summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2021-06-20 12:10:02 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2021-06-20 12:10:02 +0200
commit4e9d49d672614f68177b1ab3299ec2292ef476ec (patch)
treec64a6b8ce01c23e6d963a2ef12b31e48a328231c
parent9e593807564b5c95d0b747840be09a631ebe49a0 (diff)
Add -container-runtime containerd in e2e.tests
Change-Id: I186b4a3563a7c0afefd3683062efc227e0f0cfd1 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rw-r--r--jjb/functest/functest-kubernetes-pi.yaml15
-rw-r--r--jjb/functest/functest-kubernetes.yaml17
2 files changed, 32 insertions, 0 deletions
diff --git a/jjb/functest/functest-kubernetes-pi.yaml b/jjb/functest/functest-kubernetes-pi.yaml
index 36748bb38..6c7803b89 100644
--- a/jjb/functest/functest-kubernetes-pi.yaml
+++ b/jjb/functest/functest-kubernetes-pi.yaml
@@ -60,6 +60,13 @@
name: DEPLOY_SCENARIO
default: k8-nosdn-nofeature-noha
+- parameter:
+ name: functest-kubernetes-pi-E2E_TEST_OPTS
+ parameters:
+ - string:
+ name: E2E_TEST_OPTS
+ default: container-runtime:containerd
+
- functest-kubernetes-pi-run-containers: &functest-kubernetes-pi-run-containers
name: 'functest-kubernetes-pi-run-containers'
<<: *functest-kubernetes-pi-containers
@@ -107,6 +114,7 @@
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
+ -e E2E_TEST_OPTS=$E2E_TEST_OPTS \
-v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
$image run_tests -t {test} -p -r
@@ -221,6 +229,8 @@
build_tag: ''
- functest-kubernetes-pi-DEPLOY_SCENARIO:
DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+ - functest-kubernetes-pi-E2E_TEST_OPTS:
+ E2E_TEST_OPTS: container-runtime:containerd
builders:
- functest-kubernetes-pi-run-containers:
<<: *functest-kubernetes-pi-run-containers
@@ -336,6 +346,7 @@
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
+ -e E2E_TEST_OPTS=$E2E_TEST_OPTS \
-v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
$image zip_campaign
@@ -348,6 +359,8 @@
build_tag: ''
- functest-kubernetes-pi-DEPLOY_SCENARIO:
DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+ - functest-kubernetes-pi-E2E_TEST_OPTS:
+ E2E_TEST_OPTS: container-runtime:containerd
builders:
- functest-kubernetes-pi-zip:
<<: *functest-kubernetes-pi-containers
@@ -371,6 +384,8 @@
build_tag: ''
- functest-kubernetes-pi-DEPLOY_SCENARIO:
DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+ - functest-kubernetes-pi-E2E_TEST_OPTS:
+ E2E_TEST_OPTS: container-runtime:containerd
properties:
- build-blocker:
use-build-blocker: true
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index f463a7844..6abfaa337 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -60,6 +60,13 @@
name: DEPLOY_SCENARIO
default: k8-nosdn-nofeature-noha
+- parameter:
+ name: functest-kubernetes-E2E_TEST_OPTS
+ parameters:
+ - string:
+ name: E2E_TEST_OPTS
+ default: container-runtime:containerd
+
- functest-kubernetes-run-containers: &functest-kubernetes-run-containers
name: 'functest-kubernetes-run-containers'
<<: *functest-kubernetes-containers
@@ -107,6 +114,7 @@
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
+ -e E2E_TEST_OPTS=$E2E_TEST_OPTS \
-v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
$image run_tests -t {test} -p -r
@@ -221,6 +229,8 @@
build_tag: ''
- functest-kubernetes-DEPLOY_SCENARIO:
DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+ - functest-kubernetes-E2E_TEST_OPTS:
+ E2E_TEST_OPTS: container-runtime:containerd
builders:
- functest-kubernetes-run-containers:
<<: *functest-kubernetes-run-containers
@@ -331,6 +341,7 @@
-e BUILD_TAG=$BUILD_TAG \
-v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
+ -e E2E_TEST_OPTS=$E2E_TEST_OPTS \
-v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
$image zip_campaign
@@ -343,6 +354,8 @@
build_tag: ''
- functest-kubernetes-DEPLOY_SCENARIO:
DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+ - functest-kubernetes-E2E_TEST_OPTS:
+ E2E_TEST_OPTS: container-runtime:containerd
builders:
- functest-kubernetes-zip:
<<: *functest-kubernetes-containers
@@ -366,6 +379,8 @@
build_tag: ''
- functest-kubernetes-DEPLOY_SCENARIO:
DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+ - functest-kubernetes-E2E_TEST_OPTS:
+ E2E_TEST_OPTS: container-runtime:containerd
properties:
- build-blocker:
use-build-blocker: true
@@ -741,6 +756,8 @@
build_tag: ''
- functest-kubernetes-DEPLOY_SCENARIO:
DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+ - functest-kubernetes-E2E_TEST_OPTS:
+ E2E_TEST_OPTS: container-runtime:containerd
properties:
- build-blocker:
use-build-blocker: true