From 0bb2e004fded9c562cf0aabe7fb01cc136ca8aa7 Mon Sep 17 00:00:00 2001
From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Sat, 21 Oct 2023 12:01:38 +0200
Subject: Stop leveraing devuser
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Change-Id: Ie72e5f5b7819c56e092cad4c6218142e8c627071
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
---
jjb/functest/xtesting-ci-vm.yaml | 23 +++++++++++++----------
1 file changed, 13 insertions(+), 10 deletions(-)
diff --git a/jjb/functest/xtesting-ci-vm.yaml b/jjb/functest/xtesting-ci-vm.yaml
index 912d43793..554335a42 100644
--- a/jjb/functest/xtesting-ci-vm.yaml
+++ b/jjb/functest/xtesting-ci-vm.yaml
@@ -50,7 +50,7 @@
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
+ 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
@@ -58,7 +58,7 @@
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 devuser openssh-server xtestingci
+ 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,15 +74,16 @@
-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_DEV_USER_SHELL=/bin/bash
+ 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 devuser openssh-server 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
- builder:
@@ -97,15 +98,16 @@
-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_DEV_USER_SHELL=/bin/bash
+ 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 devuser openssh-server functest
+ 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
- builder:
@@ -121,15 +123,16 @@
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_DEV_USER_SHELL=/bin/bash
+ 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 devuser openssh-server functest-kubernetes
+ debian vm functest-kubernetes
gsutil cp functest-kubernetes-latest.qcow2 \
gs://artifacts.opnfv.org/functest-kubernetes/functest-kubernetes-latest.qcow2
--
cgit