Merge "Remove all DIB env vars in jjb"

jjb/functest/xtesting-ci-vm.yaml

@@ -50,14 +50,6 @@
           DEBIAN_FRONTEND=noninteractive sudo apt-get \
             -o DPkg::Lock::Timeout=300 install python3-diskimage-builder -y
           export ELEMENTS_PATH=$(pwd)/elements
-          export DIB_DEBIAN_COMPONENTS=main,contrib,non-free-firmware,non-free
-          export DIB_DEV_USER_SHELL=/bin/bash
-          export DIB_OPENSSH_SERVER_HARDENING=0
-          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 xtestingci-4.1.0.qcow2 debian vm xtestingci
           gsutil cp xtestingci-4.1.0.qcow2 gs://artifacts.opnfv.org/xtestingci/xtestingci-4.1.0.qcow2
 
@@ -74,7 +66,6 @@
             -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_APT_MINIMAL_CREATE_INTERFACES=0
           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
 
@@ -90,7 +81,6 @@
             -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_APT_MINIMAL_CREATE_INTERFACES=0
           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