Merge "Revert "Chore: Temp disable ONAP Openstack cleanup job""

diff --git a/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg
index fd17849..5e96729 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos8-builder-2c-1g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220915-231836.003
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221013-022318.551
 LABELS=centos8-builder-2c-1g
 HARDWARE_ID=v3-standard-2

diff --git a/jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg
index c723803..4bc1363 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos8-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20220915-231836.003
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20221013-022318.551
 LABELS=centos8-builder-4c-4g
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
index 1db2ade..b3b7aad 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20220919-172301.743
+IMAGE_NAME=ZZCI - Ubuntu 18.04 - builder - x86_64 - 20221013-041722.509
 LABELS=ubuntu1804-builder-4c-4g
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg
index 749ecea..887d9a5 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-builder-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - Ubuntu 20.04 - builder - x86_64 - 20220920-032657.200
+IMAGE_NAME=ZZCI - Ubuntu 20.04 - builder - x86_64 - 20221013-010346.073
 LABELS=ubuntu2004-builder-4c-4g
 HARDWARE_ID=v3-standard-4

diff --git a/jjb/cps/cps-cps-temporal-csit.yaml b/jjb/cps/cps-cps-temporal-csit.yaml
index 83c1cc3..362ef58 100644 (file)
--- a/jjb/cps/cps-cps-temporal-csit.yaml
+++ b/jjb/cps/cps-cps-temporal-csit.yaml
@@ -15,7 +15,9 @@
       stream:
           - 'master':
                 branch: 'master'
-          - 'istanbul':
-                branch: 'istanbul'
+          - 'jakarta':
+                branch: 'jakarta'
+          - 'kohn':
+                branch: 'kohn'
       mvn-settings: 'cps-cps-temporal-settings'
       robot-options: ''

diff --git a/jjb/cps/cps-cps-temporal.yaml b/jjb/cps/cps-cps-temporal.yaml
index 3defa76..86b26e7 100644 (file)
--- a/jjb/cps/cps-cps-temporal.yaml
+++ b/jjb/cps/cps-cps-temporal.yaml
@@ -39,12 +39,12 @@
     stream:
       - 'master':
           branch: master
-      - 'istanbul':
-          branch: 'istanbul'
-          cron: ''
       - 'jakarta':
           branch: 'jakarta'
           cron: ''
+      - 'kohn':
+          branch: 'kohn'
+          cron: ''
     mvn-settings: cps-cps-temporal-settings
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml
index e554444..ec61636 100644 (file)
--- a/jjb/cps/cps-csit.yaml
+++ b/jjb/cps/cps-csit.yaml
@@ -16,10 +16,10 @@
       stream:
           - 'master':
                 branch: 'master'
-          - 'honolulu':
-                branch: 'honolulu'
-          - 'istanbul':
-                branch: 'istanbul'
+          - 'jakarta':
+                branch: 'jakarta'
+          - 'kohn':
+                branch: 'kohn'
       mvn-settings: 'cps-settings'
       robot-options: ''
       branch: 'master'

diff --git a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
index 86ff13c..e43de25 100644 (file)
--- a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml
@@ -15,7 +15,9 @@
       stream:
           - 'master':
                 branch: 'master'
-          - 'istanbul':
-                branch: 'istanbul'
+          - 'jakarta':
+                branch: 'jakarta'
+          - 'kohn':
+                branch: 'kohn'
       mvn-settings: 'cps-ncmp-dmi-plugin-settings'
       robot-options: ''

diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml
index 1633241..432041f 100644 (file)
--- a/jjb/cps/cps-ncmp-dmi-plugin.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml
@@ -42,12 +42,12 @@
     stream:
       - 'master':
           branch: master
-      - 'istanbul':
-          branch: 'istanbul'
-          cron: ''
       - 'jakarta':
           branch: 'jakarta'
           cron: ''
+      - 'kohn':
+          branch: 'kohn'
+          cron: ''
     mvn-settings: cps-ncmp-dmi-plugin-settings
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index 6d7a3b9..0baf896 100644 (file)
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -55,12 +55,12 @@
     stream:
       - 'master':
           branch: 'master'
-      - 'istanbul':
-          branch: 'istanbul'
-          cron: ''
       - 'jakarta':
           branch: 'jakarta'
           cron: ''
+      - 'kohn':
+          branch: 'kohn'
+          cron: ''
     mvn-settings: 'cps-settings'
     files: '**'
     archive-artifacts: ''

diff --git a/packer/common-packer b/packer/common-packer
index 1c52802..15aba27 160000 (submodule)
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit 1c52802cedc44386820bc50e1388c8c759bb0be2
+Subproject commit 15aba27a45f98edb33890daa3712c6a4371b2947