From: Matthew McNeilly <matthew.mcneilly@est.tech>
Date: Wed, 23 Mar 2022 09:48:22 +0000 (+0000)
Subject: Merge "Geode: Revert build slave back to Ubuntu 18.04"
X-Git-Url: https://gerrit.nordix.org/gitweb?a=commitdiff_plain;h=f766a9dfd95494a6d278c4af6c2d68e8963303a9;hp=e5e1bbebc93c63273a5df84ca18c4a029259b4d0;p=infra%2Fcicd.git

Merge "Geode: Revert build slave back to Ubuntu 18.04"
---

diff --git a/jjb/geode/apache-geode-slave/apache-geode-slave-setup.yaml b/jjb/geode/apache-geode-slave/apache-geode-slave-setup.yaml
index 9fc9d499f..f4deac383 100644
--- a/jjb/geode/apache-geode-slave/apache-geode-slave-setup.yaml
+++ b/jjb/geode/apache-geode-slave/apache-geode-slave-setup.yaml
@@ -20,7 +20,7 @@
 - job:
     name: 'apache-geode-SlaveSetup'
 
-    node: geode-ubuntu2004
+    node: geode-ubuntu1804
     disabled: false
     concurrent: true
 
diff --git a/jjb/geode/apache-geode-test-coordinator.yaml b/jjb/geode/apache-geode-test-coordinator.yaml
index 031f5814a..abcb53287 100644
--- a/jjb/geode/apache-geode-test-coordinator.yaml
+++ b/jjb/geode/apache-geode-test-coordinator.yaml
@@ -32,7 +32,7 @@
     project-type: multijob
     disabled: false
     concurrent: true
-    node: geode-ubuntu2004
+    node: geode-ubuntu1804
 
     parameters:
       - string:
diff --git a/jjb/geode/global-template-apache-geode-build.yaml b/jjb/geode/global-template-apache-geode-build.yaml
index 99aeb1404..65217c472 100644
--- a/jjb/geode/global-template-apache-geode-build.yaml
+++ b/jjb/geode/global-template-apache-geode-build.yaml
@@ -20,7 +20,7 @@
 - job-template:
     name: 'apache-geode-build-release-jdk{java-build-version}'
 
-    node: geode-ubuntu2004
+    node: geode-ubuntu1804
     disabled: false
     concurrent: true
 
@@ -86,4 +86,4 @@
           notify-start: true
           notify-success: true
           notify-failure: true
-          notify-back-to-normal: true
\ No newline at end of file
+          notify-back-to-normal: true
diff --git a/jjb/geode/global-template-apache-geode-test.yaml b/jjb/geode/global-template-apache-geode-test.yaml
index 159d65a78..a1167fee0 100644
--- a/jjb/geode/global-template-apache-geode-test.yaml
+++ b/jjb/geode/global-template-apache-geode-test.yaml
@@ -20,7 +20,7 @@
 - job-template:
     name: 'apache-geode-{test-type}Test-jdk{java-test-version}'
 
-    node: geode-ubuntu2004
+    node: geode-ubuntu1804
     disabled: false
     concurrent: true