Merge "Add Geode 1804 and 2004 to jenkins slave update build script"

diff --git a/jjb/geode-native/apache-geode-native-slave/apache-geode-native-slave-setup.yaml b/jjb/geode-native/apache-geode-native-slave/apache-geode-native-slave-setup.yaml
index 613408b433edf063ed799d76b8ba8ff0d13291c1..71b93814387d8f4d8efb867ce30a10b49ec857b0 100644 (file)
--- a/jjb/geode-native/apache-geode-native-slave/apache-geode-native-slave-setup.yaml
+++ b/jjb/geode-native/apache-geode-native-slave/apache-geode-native-slave-setup.yaml
@@ -30,7 +30,7 @@
     parameters:
       - string:
           name: GEODE_NATIVE_DOCKER_IMAGE
-          default: 'apachegeode/geode-native-build'
+          default: 'registry.nordix.org/docker-hub-proxy/apachegeode/geode-native-build'
           description: JJB configured name of the geode-native build docker image based on Ubuntu 18.04
 
     builders:

diff --git a/jjb/geode-native/global-template-apache-geode-native-test.yaml b/jjb/geode-native/global-template-apache-geode-native-test.yaml
index b1490c041490379816911f8d74f8d0bea4d0e0ab..ecdf7cb2a1045b986f9fe644cd7c85171e1229fa 100644 (file)
--- a/jjb/geode-native/global-template-apache-geode-native-test.yaml
+++ b/jjb/geode-native/global-template-apache-geode-native-test.yaml
@@ -44,7 +44,7 @@
           description: JJB configured JOBS parameter. Specifies the number of make jobs to run simultaneously while building geode-native
       - string:
           name: GEODE_NATIVE_DOCKER_IMAGE
-          default: 'apachegeode/geode-native-build:1.13.2'
+          default: 'registry.nordix.org/docker-hub-proxy/apachegeode/geode-native-build:1.13.2'
           description: JJB configured name of the geode-native build docker image based on Ubuntu 20.04
 
     scm:

diff --git a/jjb/metal3/job_ipa_image_building_test.yml b/jjb/metal3/job_ipa_image_building_test.yml
index 5a4f76a4ba01b1d764fc2904eaef646d0b5d1445..1dd9d52a4881ba2756309bd3b5faf5ee672ef79e 100644 (file)
--- a/jjb/metal3/job_ipa_image_building_test.yml
+++ b/jjb/metal3/job_ipa_image_building_test.yml
@@ -149,5 +149,10 @@
           wipe-workspace: True
           honor-refspec: True
           shallow-clone: False
+          included-regions:
+                - "ci/scripts/image_scripts/ipa_builder_elements/.*"
+                - "ci/scripts/image_scripts/build_ipa.sh"
+                - "ci/scripts/image_scripts/run_build_ironic.sh"
+                - "ci/scripts/image_scripts/start_centos_ipa_ironic_build.sh"
       script-path: "ci/jobs/openstack_ipa_and_ironic_image_building.pipeline"
       lightweight-checkout: False

diff --git a/jjb/metal3/job_main_ipa_image_building.yml b/jjb/metal3/job_main_ipa_image_building.yml
index 6bfc4fc4ef9f6881a5c1d738852654d644904a35..fbcc72400f7f79fc061d8992deaad7bb33ab0113 100644 (file)
--- a/jjb/metal3/job_main_ipa_image_building.yml
+++ b/jjb/metal3/job_main_ipa_image_building.yml
@@ -111,5 +111,10 @@
           wipe-workspace: True
           honor-refspec: True
           shallow-clone: False
+          included-regions:
+                - "ci/scripts/image_scripts/ipa_builder_elements/.*"
+                - "ci/scripts/image_scripts/build_ipa.sh"
+                - "ci/scripts/image_scripts/run_build_ironic.sh"
+                - "ci/scripts/image_scripts/start_centos_ipa_ironic_build.sh"
       script-path: "ci/jobs/openstack_ipa_and_ironic_image_building.pipeline"
       lightweight-checkout: False

diff --git a/jjb/metal3/job_openstack_image_building.yml b/jjb/metal3/job_openstack_image_building.yml
index add69a9b56f2d856257e305a9fa48fd7ea20f241..05eec4e8302798e2400a3d55a367230188066a8a 100644 (file)
--- a/jjb/metal3/job_openstack_image_building.yml
+++ b/jjb/metal3/job_openstack_image_building.yml
@@ -35,11 +35,11 @@
     parameters:
     - string:
         name: KUBERNETES_VERSION
-        default: "v1.23.3"
+        default: "v1.23.5"
         description: 'Kubernetes version'
     - string:
         name: KIND_NODE_IMAGE_VERSION
-        default: "v1.23.3"
+        default: "v1.23.4"
         description: 'Kind node container image version'
 
     properties:

diff --git a/jjb/metal3/job_openstack_node_image_building.yml b/jjb/metal3/job_openstack_node_image_building.yml
index 6c3cc5c495eec43723fff2b91e8b53eda8249542..6c26c8cfdb36a5c5ae348e991cfc5b2cb166775b 100644 (file)
--- a/jjb/metal3/job_openstack_node_image_building.yml
+++ b/jjb/metal3/job_openstack_node_image_building.yml
@@ -35,7 +35,7 @@
     parameters:
     - string:
         name: KUBERNETES_VERSION
-        default: "v1.23.3"
+        default: "v1.23.5"
         description: 'Kubernetes version'
 
     properties: