Reduce disk-image-builder env vars

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

diff --git a/jjb/functest/xtesting-ci-vm.yaml b/jjb/functest/xtesting-ci-vm.yaml
index 554335a..3a5d5de 100644 (file)
--- a/jjb/functest/xtesting-ci-vm.yaml
+++ b/jjb/functest/xtesting-ci-vm.yaml
@@ -74,15 +74,7 @@
             -o DPkg::Lock::Timeout=300 install python3-diskimage-builder -y
           git clone https://github.com/collivier/ansible-role-xtesting.git
           export ELEMENTS_PATH=$(pwd)/elements:$(pwd)/ansible-role-xtesting/elements
-          export DIB_DEBIAN_COMPONENTS=main,contrib,non-free-firmware,non-free
           export DIB_APT_MINIMAL_CREATE_INTERFACES=0
-          export DIB_OPENSSH_SERVER_HARDENING=0
-          export DIB_DEV_USER_SHELL=/bin/bash
-          export DIB_DEV_USER_PASSWORD=xtesting
-          export DIB_DEV_USER_PWDLESS_SUDO=yes
-          export DIB_CLOUD_INIT_ALLOW_SSH_PWAUTH=Yes
-          export DIB_RELEASE=bookworm
-          export DIB_DEV_USER_USERNAME=xtesting
           disk-image-create --image-size 20 -o xtesting-latest.qcow2 debian vm xtesting
           gsutil cp xtesting-latest.qcow2 gs://artifacts.opnfv.org/xtesting/xtesting-latest.qcow2
 
@@ -98,15 +90,7 @@
             -o DPkg::Lock::Timeout=300 install python3-diskimage-builder -y
           git clone https://github.com/collivier/ansible-role-xtesting.git
           export ELEMENTS_PATH=$(pwd)/elements:$(pwd)/ansible-role-xtesting/elements
-          export DIB_DEBIAN_COMPONENTS=main,contrib,non-free-firmware,non-free
           export DIB_APT_MINIMAL_CREATE_INTERFACES=0
-          export DIB_OPENSSH_SERVER_HARDENING=0
-          export DIB_DEV_USER_SHELL=/bin/bash
-          export DIB_DEV_USER_PASSWORD=xtesting
-          export DIB_DEV_USER_PWDLESS_SUDO=yes
-          export DIB_CLOUD_INIT_ALLOW_SSH_PWAUTH=Yes
-          export DIB_RELEASE=bookworm
-          export DIB_DEV_USER_USERNAME=xtesting
           disk-image-create --image-size 20 -o functest-latest.qcow2 debian vm functest
           gsutil cp functest-latest.qcow2 gs://artifacts.opnfv.org/functest/functest-latest.qcow2
 
@@ -122,15 +106,7 @@
             -o DPkg::Lock::Timeout=300 install python3-diskimage-builder -y
           git clone https://github.com/collivier/ansible-role-xtesting.git
           export ELEMENTS_PATH=$(pwd)/elements:$(pwd)/ansible-role-xtesting/elements
-          export DIB_DEBIAN_COMPONENTS=main,contrib,non-free
           export DIB_APT_MINIMAL_CREATE_INTERFACES=0
-          export DIB_OPENSSH_SERVER_HARDENING=0
-          export DIB_DEV_USER_SHELL=/bin/bash
-          export DIB_DEV_USER_PASSWORD=xtesting
-          export DIB_DEV_USER_PWDLESS_SUDO=yes
-          export DIB_CLOUD_INIT_ALLOW_SSH_PWAUTH=Yes
-          export DIB_RELEASE=bookworm
-          export DIB_DEV_USER_USERNAME=xtesting
           disk-image-create --image-size 20 -o functest-kubernetes-latest.qcow2 \
             debian vm functest-kubernetes
           gsutil cp functest-kubernetes-latest.qcow2 \