X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Fxtesting-ci-vm.yaml;h=9d5d928981cc4c3cd84ac6783ddd3a974a9fe7e3;hb=refs%2Fchanges%2F04%2F74204%2F1;hp=3a5d5de452f3141693d45d2b27b38373081e08cb;hpb=496001e6c38ebe00d9997cce89fd9d75b4f6911c;p=releng.git

diff --git a/jjb/functest/xtesting-ci-vm.yaml b/jjb/functest/xtesting-ci-vm.yaml
index 3a5d5de45..9d5d92898 100644
--- a/jjb/functest/xtesting-ci-vm.yaml
+++ b/jjb/functest/xtesting-ci-vm.yaml
@@ -49,68 +49,14 @@
           sudo apt-get -o DPkg::Lock::Timeout=300 update && \
           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
-
-
-- builder:
-    name: xtesting-vm-builder
-    builders:
-      - shell: |
-          curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
-          echo "deb https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee \
-            /etc/apt/sources.list.d/google-cloud-sdk.list
-          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
-          DEBIAN_FRONTEND=noninteractive sudo apt-get \
-            -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
-
-- builder:
-    name: functest-vm-builder
-    builders:
-      - shell: |
-          curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
-          echo "deb https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee \
-            /etc/apt/sources.list.d/google-cloud-sdk.list
-          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
-          DEBIAN_FRONTEND=noninteractive sudo apt-get \
-            -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
-
-- builder:
-    name: functest-kubernetes-vm-builder
-    builders:
-      - shell: |
-          curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
-          echo "deb https://packages.cloud.google.com/apt cloud-sdk main" | sudo tee \
-            /etc/apt/sources.list.d/google-cloud-sdk.list
-          sudo apt-get -o DPkg::Lock::Timeout=300 update && \
-          DEBIAN_FRONTEND=noninteractive sudo apt-get \
-            -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-kubernetes-latest.qcow2 \
-            debian vm functest-kubernetes
-          gsutil cp functest-kubernetes-latest.qcow2 \
-            gs://artifacts.opnfv.org/functest-kubernetes/functest-kubernetes-latest.qcow2
+          if [ "{project}" == "xtestingci" ]; then
+            export ELEMENTS_PATH=$(pwd)/elements
+          else
+            git clone https://github.com/collivier/ansible-role-xtesting.git
+            export ELEMENTS_PATH=$(pwd)/elements:$(pwd)/ansible-role-xtesting/elements
+          fi
+          disk-image-create --image-size 20 -o {project}-{version}.qcow2 debian vm {project}
+          gsutil cp {project}-{version}.qcow2 gs://artifacts.opnfv.org/{project}/{project}-{version}.qcow2
 
 - trigger:
     name: xtesting-ci-vm-trigger
@@ -139,7 +85,9 @@
           blocking-jobs:
             - '^.*-vm$'
     builders:
-      - xtesting-ci-vm-builder
+      - xtesting-ci-vm-builder:
+          project: xtestingci
+          version: 4.1.0
 
 - job-template:
     name: 'xtesting-vm'
@@ -150,7 +98,9 @@
     parameters:
       - xtesting-ci-vm-parameter
     builders:
-      - xtesting-vm-builder
+      - xtesting-ci-vm-builder:
+          project: xtesting
+          version: latest
 
 - job-template:
     name: 'functest-vm'
@@ -161,7 +111,9 @@
     parameters:
       - xtesting-ci-vm-parameter
     builders:
-      - functest-vm-builder
+      - xtesting-ci-vm-builder:
+          project: functest
+          version: latest
 
 - job-template:
     name: 'functest-kubernetes-vm'
@@ -172,7 +124,9 @@
     parameters:
       - xtesting-ci-vm-parameter
     builders:
-      - functest-kubernetes-vm-builder
+      - xtesting-ci-vm-builder:
+          project: functest-kubernetes
+          version: latest
 
 - project:
     name: 'xtesting-ci-vm'