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 9fc9d499f98b5fa06a080c66b1d9a457145a31f5..f4deac383715d8d41eddc52cf4ad0978bfa395a1 100644 (file)
--- 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 031f5814a293cabe7e640759e34d100ab495de46..abcb532872345d00941d995d7b96beffdb834e64 100644 (file)
--- 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 99aeb1404845420bca702c37b499e04aeb45cd6f..65217c4723c989f65ed565765daf60c85e88a043 100644 (file)
--- 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 159d65a780164ef87490599971a0a64a7a97b312..a1167fee0ede5f0d9e8f0b18a262905a87a54245 100644 (file)
--- 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