Merge "Resolve CCSDK, SDNC openjdk17 compile issues"

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 5e96729..bdb3ccb 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 - 20221013-022318.551
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230131-200810.126
 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 4bc1363..2bff0e7 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 - 20221013-022318.551
+IMAGE_NAME=ZZCI - CentOS Stream 8 - builder - x86_64 - 20230131-200810.126
 LABELS=centos8-builder-4c-4g
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg
index b58f8dc..6df78aa 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos8-docker-8c-8g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=ZZCI - CentOS Stream 8 - docker - x86_64 - 20220912-171155.418
+IMAGE_NAME=ZZCI - CentOS Stream 8 - docker - x86_64 - 20230131-200840.321
 LABELS=centos8-docker-8c-8g
 HARDWARE_ID=v3-standard-8

diff --git a/jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg b/jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg
index 0c5f296..0076226 100644 (file)
--- a/jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg
+++ b/jenkins-config/clouds/openstack/cattle/centos8-redis-4c-4g.cfg
@@ -1,3 +1,3 @@
-IMAGE_NAME=CentOS Stream 8 - redis -  - 150980909-9011
+IMAGE_NAME=CentOS Stream 8 - redis -  - 310180101-1010
 LABELS=centos8-redis-4c-4g
 HARDWARE_ID=v3-standard-4

diff --git a/jenkins-config/managed-config-files/custom/pypirc/content b/jenkins-config/managed-config-files/custom/pypirc/content
index 6a0fcdc..7103c83 100644 (file)
--- a/jenkins-config/managed-config-files/custom/pypirc/content
+++ b/jenkins-config/managed-config-files/custom/pypirc/content
@@ -29,3 +29,8 @@ password: $PYPI_TEST_TOKEN
 repository: https://pypi.org/
 username: __token__
 password: $PYPI_TOKEN
+
+[pypi-onapsdk]
+repository: https://pypi.org/
+username: __token__
+password: $ONAP_PYPI_TOKEN

diff --git a/jenkins-config/managed-config-files/custom/pypirc/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/pypirc/customizedCredentialMappings.yaml
index 894c65b..76a3e80 100644 (file)
--- a/jenkins-config/managed-config-files/custom/pypirc/customizedCredentialMappings.yaml
+++ b/jenkins-config/managed-config-files/custom/pypirc/customizedCredentialMappings.yaml
@@ -6,3 +6,5 @@ customizedCredentialMappings:
     tokenKey: "PYPI_TOKEN"
   - credentialsId: "pypi-test-token"
     tokenKey: "PYPI_TEST_TOKEN"
+  - credentialsId: "onap-pypi-api-key"
+    tokenKey: "ONAP_PYPI_TOKEN"