Remove all non proxy env args

Change-Id: Id4f504b6fcaba200c6f9c48b55f0b46ac18cb82f
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 8c7b7de..a876cf9 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -741,8 +741,6 @@
     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
@@ -1181,8 +1179,6 @@
     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 01e0176..fd658c5 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -963,9 +963,6 @@
     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
@@ -1522,9 +1519,6 @@
     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