Readjust Calcium jobs

Calcium maven-stage jobs need to be running on CentOS for now, as sigul
does not work on ubuntu. Switch back to using CentOS.

Change-Id: Icd6cf7f498bad1140d9ec934e24008280681473e
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/jjb/infrautils/infrautils.yaml b/jjb/infrautils/infrautils.yaml
index 40f2718c95202c37bcd396b31212ac42772ae8fd..c6ccb6e2649564ae3d25fff5b2dfa521f1028235 100644 (file)
--- a/jjb/infrautils/infrautils.yaml
+++ b/jjb/infrautils/infrautils.yaml
@@ -29,20 +29,21 @@
     name: infrautils-6.0.x
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: ubuntu2004-docker-2c-2g
+          build-node: centos8-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: infrautils
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-infrautils/38993/
           rtd-token: 294c76173237e3a088365c31012cf4ddaa767dc9
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
-      - odl-maven-verify-jobs-jdk21
+      - odl-maven-verify-jobs-jdk21:
+          build-node: ubuntu2004-docker-2c-2g
 
     project: infrautils
     project-name: infrautils
     stream: 6.0.x
     branch: 6.0.x
-    build-node: ubuntu2004-docker-2c-2g
+    build-node: centos8-builder-2c-2g
 
     mvn-settings: "infrautils-settings"
 

diff --git a/jjb/odlparent/odlparent.yaml b/jjb/odlparent/odlparent.yaml
index f489fd6052f321d6a7c36887936f51d5d840a2b7..3cd9188101f0f129cf0f76b906f652e2a9b11243 100644 (file)
--- a/jjb/odlparent/odlparent.yaml
+++ b/jjb/odlparent/odlparent.yaml
@@ -37,21 +37,22 @@
     name: odlparent-13.1.x
     jobs:
       - "{project-name}-rtd-jobs":
-          build-node: ubuntu2004-docker-2c-2g
+          build-node: centos8-builder-2c-2g
           doc-dir: .tox/docs/tmp/html
           project-pattern: odlparent
           rtd-build-url: https://readthedocs.org/api/v2/webhook/odl-odlparent/50830/
           rtd-token: e5afd4ac1ead64408d9e13cd1f628ade55512f8f
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
-      - odl-maven-verify-jobs-jdk21
+      - odl-maven-verify-jobs-jdk21:
+          build-node: ubuntu2004-docker-2c-2g
       - gerrit-tox-verify
 
     project: odlparent
     project-name: odlparent
     stream: 13.1.x
     branch: 13.1.x
-    build-node: ubuntu2004-docker-2c-2g
+    build-node: centos8-builder-2c-2g
 
     mvn-settings: odlparent-settings
 

diff --git a/jjb/yangtools/yangtools.yaml b/jjb/yangtools/yangtools.yaml
index 3a235e9a87355e3f84e4c077176444d08811738a..958df0dd2acb35daaaa2edba975c9981e1477ba3 100644 (file)
--- a/jjb/yangtools/yangtools.yaml
+++ b/jjb/yangtools/yangtools.yaml
@@ -24,13 +24,13 @@
     jobs:
       - odl-maven-jobs-jdk17
       - odl-maven-verify-jobs-jdk17
-      - odl-maven-verify-jobs-jdk21
+      - odl-maven-verify-jobs-jdk21:
+          build-node: ubuntu2004-docker-4c-4g
 
     project: yangtools
     project-name: yangtools
     stream: 13.0.x
     branch: 13.0.x
-    build-node: ubuntu2004-docker-4c-4g
 
     mvn-settings: "yangtools-settings"