Code Review / releng.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Fix ELEMENT_PATH logic
[releng.git] / jjb / functest / xtesting-ci-vm.yaml
diff --git a/jjb/functest/xtesting-ci-vm.yaml b/jjb/functest/xtesting-ci-vm.yaml
index 655de62..71222d8 100644 (file)
--- 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,6 +14,8 @@
     scm:
       - git:
           url: https://git.opnfv.org/functest-xtesting.git
+          branches:
+            - master
           git-config-name:
           git-config-email:
 
@@ -20,57 +24,23 @@
     scm:
       - git:
           url: https://git.opnfv.org/functest.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
-
-
-- 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
-          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
+- 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: functest-vm-builder
+    name: xtesting-ci-vm-builder
     builders:
       - shell: |
           curl https://packages.cloud.google.com/apt/doc/apt-key.gpg | sudo apt-key add -
@@ -79,18 +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
-          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 functest-latest.qcow2 debian vm devuser openssh-server functest
-          gsutil cp functest-latest.qcow2 gs://artifacts.opnfv.org/functest/functest-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
@@ -112,8 +78,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'
@@ -124,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'
@@ -135,7 +111,22 @@
     parameters:
       - xtesting-ci-vm-parameter
     builders:
-      - functest-vm-builder
+      - 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'
@@ -143,6 +134,7 @@
       - 'xtesting-ci-vm'
       - 'xtesting-vm'
       - 'functest-vm'
+      - 'functest-kubernetes-vm'
 
 - view:
     name: xtesting-ci-vm
@@ -154,4 +146,4 @@
       - last-success
       - last-failure
       - last-duration
-    regex: ^.*-vm.*$
+    regex: ^.*-vm$