Merge "CI: Add key and pypirc change for onapsdk"

diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml
index 4332472..6b49939 100644 (file)
--- a/jjb/ccsdk/ccsdk-oran.yaml
+++ b/jjb/ccsdk/ccsdk-oran.yaml
@@ -9,21 +9,21 @@
           cron: '@daily'
           mvn-params: '-Dmaven.test.skip=true'
       - gerrit-maven-stage:
-          build-node: centos7-builder-4c-4g
+          build-node: centos8-builder-4c-4g
           sign-artifacts: true
           mvn-params: '-Dmaven.test.skip=true'
           mvn-opts: '-Ddocker.skip=true'
           cron: ''
           sbom-generator: false
       - gerrit-maven-docker-stage:
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
           container-public-registry: 'nexus3.onap.org:10001'
           container-staging-registry: 'nexus3.onap.org:10003'
           mvn-params: '-Dmaven.test.skip=true -Pdocker'
           maven-versions-plugin: true
           cron: '@daily'
       - '{project-name}-gerrit-release-jobs':
-          build-node: centos7-docker-8c-8g
+          build-node: centos8-docker-8c-8g
     project: 'ccsdk/oran'
     stream:
       - 'master':
@@ -39,7 +39,7 @@
     archive-artifacts: ''
     docker-pom: 'pom.xml'
     mvn-profile: docker
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     mvn-snapshot-id: 'ecomp-snapshots'
     nexus-snapshot-repo: 'snapshots'
 
@@ -79,7 +79,7 @@
         pattern: 'a1-policy-management/.*'
     sonar-mvn-goal: '{sonar_mvn_goal}'
     cron: '@daily'
-    build-node: centos7-docker-8c-8g
+    build-node: centos8-docker-8c-8g
     project: 'ccsdk/oran'
     project-name: 'ccsdk-oran'
     branch: 'master'

diff --git a/jjb/integration/integration-python-onapsdk.yaml b/jjb/integration/integration-python-onapsdk.yaml
index 80eee68..e780058 100644 (file)
--- a/jjb/integration/integration-python-onapsdk.yaml
+++ b/jjb/integration/integration-python-onapsdk.yaml
@@ -84,4 +84,6 @@
         pattern: 'src/onapsdk/version.py'
     jobs:
       - gerrit-pypi-release-verify
-      - gerrit-pypi-release-merge
+      - gerrit-pypi-release-merge:
+          pypi-repo: pypi-onapsdk
+

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 2bb6a83..dfad61b 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -35,6 +35,8 @@
       - 'kohn':
           branch: 'kohn'
     mvn-settings: 'policy-drools-applications-settings'
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     java-version: openjdk11
     files: '**'
     archive-artifacts: ''
@@ -55,6 +57,8 @@
     project-name: 'policy-drools-applications'
     branch: 'master'
     mvn-settings: 'policy-drools-applications-settings'
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     java-version: openjdk11
     java-opts: '-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false'
     mvn-goals: 'clean install'
@@ -72,6 +76,8 @@
           branch: 'master'
     mvn-settings: 'policy-drools-applications-settings'
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
+    mvn-version: "mvn36"
+    maven-version: "mvn36"
     java-version: openjdk11
     build-node: ubuntu1804-docker-8c-8g