X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Fxtesting-ci-vm.yaml;h=8ab1c03bfc8e66ddc9c7af0b8b06d5e82367313d;hb=7493ea1d95ffb72cc02444c94f8d2452525c6919;hp=b15104ccd4b24d30d2b404b2aacf821833c3de3a;hpb=e0b193d4b467b0dd3b6c6d6da7760ffec1fdb615;p=releng.git

diff --git a/jjb/functest/xtesting-ci-vm.yaml b/jjb/functest/xtesting-ci-vm.yaml
index b15104ccd..8ab1c03bf 100644
--- a/jjb/functest/xtesting-ci-vm.yaml
+++ b/jjb/functest/xtesting-ci-vm.yaml
@@ -4,6 +4,8 @@
     scm:
       - git:
           url: https://github.com/collivier/ansible-role-xtesting.git
+          branches:
+            - master
           git-config-name:
           git-config-email:
 
@@ -12,34 +14,33 @@
     scm:
       - git:
           url: https://git.opnfv.org/functest-xtesting.git
+          branches:
+            - master
           git-config-name:
           git-config-email:
 
-- builder:
-    name: xtesting-ci-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
-          export ELEMENTS_PATH=$(pwd)/elements
-          export DIB_DEBIAN_COMPONENTS=main,contrib,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 devuser openssh-server xtestingci
-          gsutil cp xtestingci-4.1.0.qcow2 gs://artifacts.opnfv.org/xtestingci/xtestingci-4.1.0.qcow2
+- scm:
+    name: functest-vm-scm
+    scm:
+      - git:
+          url: https://git.opnfv.org/functest.git
+          branches:
+            - master
+          git-config-name:
+          git-config-email:
 
+- scm:
+    name: functest-kubernetes-vm-scm
+    scm:
+      - git:
+          url: https://git.opnfv.org/functest-kubernetes.git
+          branches:
+            - master
+          git-config-name:
+          git-config-email:
 
 - builder:
-    name: xtesting-vm-builder
+    name: xtesting-ci-vm-builder
     builders:
       - shell: |
           curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
@@ -48,18 +49,9 @@
           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
-          export DIB_DEBIAN_COMPONENTS=main,contrib,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 xtesting-latest.qcow2 debian vm devuser openssh-server xtesting
-          gsutil cp xtesting-latest.qcow2 gs://artifacts.opnfv.org/xtesting/xtesting-latest.qcow2
+          disk-image-create --image-size 20 -o {project}-{version}.qcow2 debian vm {project}
+          gsutil cp xtestingci-{version}.qcow2 gs://artifacts.opnfv.org/{project}/{project}-{version}.qcow2
 
 - trigger:
     name: xtesting-ci-vm-trigger
@@ -81,8 +73,16 @@
       - xtesting-ci-vm-trigger
     parameters:
       - xtesting-ci-vm-parameter
+    properties:
+      - build-blocker:
+          use-build-blocker: true
+          blocking-level: 'NODE'
+          blocking-jobs:
+            - '^.*-vm$'
     builders:
-      - xtesting-ci-vm-builder
+      - xtesting-ci-vm-builder:
+          project: xtestingci
+          version: 4.1.0
 
 - job-template:
     name: 'xtesting-vm'
@@ -93,14 +93,43 @@
     parameters:
       - xtesting-ci-vm-parameter
     builders:
-      - xtesting-vm-builder
+      - xtesting-ci-vm-builder:
+          project: xtesting
+          version: latest
+
+- job-template:
+    name: 'functest-vm'
+    scm:
+      - functest-vm-scm
+    triggers:
+      - xtesting-ci-vm-trigger
+    parameters:
+      - xtesting-ci-vm-parameter
+    builders:
+      - xtesting-ci-vm-builder:
+          project: functest
+          version: latest
 
+- job-template:
+    name: 'functest-kubernetes-vm'
+    scm:
+      - functest-kubernetes-vm-scm
+    triggers:
+      - xtesting-ci-vm-trigger
+    parameters:
+      - xtesting-ci-vm-parameter
+    builders:
+      - xtesting-ci-vm-builder:
+          project: functest-kubernetes
+          version: latest
 
 - project:
     name: 'xtesting-ci-vm'
     jobs:
       - 'xtesting-ci-vm'
       - 'xtesting-vm'
+      - 'functest-vm'
+      - 'functest-kubernetes-vm'
 
 - view:
     name: xtesting-ci-vm
@@ -112,4 +141,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^xtesting.*-vm.*$
+    regex: ^.*-vm$