Take last XtestingCI updates into account

Change-Id: I575c0bfdc69c0cc87b189a6295f1c8cee0893340
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index a876cf9..8c7b7de 100644 (file)
--- 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 fd658c5..01e0176 100644 (file)
--- 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