summaryrefslogtreecommitdiffstats
path: root/jjb/functest
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2021-09-20 14:30:10 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2021-09-20 14:30:10 +0200
commitd4f4c17c522bc90602ddc9161f33ddc5452ebec9 (patch)
tree5f0bbd098cb2353d0f7aa7e3b1b50374dc539c5b /jjb/functest
parent436eec5c43295a1181de6d5301d75f5b4a805588 (diff)
Take last XtestingCI updates into account
Change-Id: I575c0bfdc69c0cc87b189a6295f1c8cee0893340 Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'jjb/functest')
-rw-r--r--jjb/functest/functest-kubernetes.yaml4
-rw-r--r--jjb/functest/functest.yaml6
2 files changed, 10 insertions, 0 deletions
diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index a876cf9b5..8c7b7de7c 100644
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -741,6 +741,8 @@
builders:
- shell: |
set +x
+ export DEPLOY_SCENARIO=k8-nosdn-nofeature-noha
+ export E2E_TEST_OPTS=container-runtime:containerd
apt-get update && DEBIAN_FRONTEND=noninteractive \
apt-get install software-properties-common gpg -y
add-apt-repository -y ppa:deadsnakes/ppa
@@ -1179,6 +1181,8 @@
name: functest-kubernetes-trivy
builders:
- shell: |
+ export DEPLOY_SCENARIO=k8-nosdn-nofeature-noha
+ export E2E_TEST_OPTS=container-runtime:containerd
apt-get update && DEBIAN_FRONTEND=noninteractive \
apt-get install curl -y
diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index fd658c5b2..01e017694 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -963,6 +963,9 @@
builders:
- shell: |
set +x
+ export EXTERNAL_NETWORK=public
+ export VOLUME_DEVICE_NAME=sdb
+ export IMAGE_PROPERTIES=hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
apt-get install software-properties-common gpg -y
sudo add-apt-repository -y ppa:deadsnakes/ppa
@@ -1519,6 +1522,9 @@
name: functest-trivy
builders:
- shell: |
+ export EXTERNAL_NETWORK=public
+ export VOLUME_DEVICE_NAME=sdb
+ export IMAGE_PROPERTIES=hw_scsi_model:virtio-scsi,hw_disk_bus:scsi
sudo apt-get update && sudo DEBIAN_FRONTEND=noninteractive \
apt-get install curl -y