Merge "Fix: Use correct endpoint for onapsdk in pypirc"

diff --git a/jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/config-params.yaml
new file mode 100644 (file)
index 0000000..4465b9c
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/config-params.yaml
@@ -0,0 +1,3 @@
+---
+name: "modeling-yang-kit-settings"
+comment: "modeling-yang-kit-settings"

diff --git a/jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/content b/jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/content
similarity index 100%
rename from jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/content
rename to jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/content

diff --git a/jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/serverCredentialMappings.sandbox.yaml
similarity index 100%
rename from jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/serverCredentialMappings.sandbox.yaml
rename to jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/serverCredentialMappings.sandbox.yaml

diff --git a/jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/serverCredentialMappings.yaml
similarity index 90%
rename from jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/serverCredentialMappings.yaml
rename to jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/serverCredentialMappings.yaml
index aaa81dd..f2db82c 100644 (file)
--- a/jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/serverCredentialMappings.yaml
+++ b/jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/serverCredentialMappings.yaml
@@ -1,7 +1,7 @@
 ---
 serverCredentialMappings:
   - serverId: "ecomp-snapshots"
-    credentialsId: &cred "modeling-yangvalidators"
+    credentialsId: &cred "modeling-yang-kit"
   - serverId: "ecomp-site"
     credentialsId: *cred
   - serverId: "ecomp-staging"

diff --git a/jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/config-params.yaml
deleted file mode 100644 (file)
index e1f7c05..0000000
--- a/jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/config-params.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
----
-name: "modeling-yangvalidators-settings"
-comment: "modeling-yangvalidators-settings"

diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
deleted file mode 100644 (file)
index 3cba41c..0000000
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
----
-- project:
-    name: dmaap-project-view
-    project-name: dmaap
-    views:
-      - project-view
-
-- project:
-    name: dmaap-buscontroller-java
-    project-name: "dmaap-buscontroller"
-    jobs:
-      - "{project-name}-{stream}-verify-java"
-      - "{project-name}-{stream}-merge-java"
-      - gerrit-maven-docker-stage:
-          build-node: ubuntu1804-docker-8c-8g
-          mvn-goals: "clean package -P docker docker:build docker:push -DskipTests=true"
-          container-public-registry: "nexus3.onap.org:10001"
-          container-staging-registry: "nexus3.onap.org:10003"
-          cron: ""
-      - "{project-name}-gerrit-release-jobs":
-          build-node: centos7-docker-2c-1g
-    project: "dmaap/buscontroller"
-    stream:
-      - "master":
-          branch: "master"
-      - "london":
-          branch: "london"
-    mvn-settings: "dmaap-buscontroller-settings"
-    files: "**"
-    archive-artifacts: ""
-    java-version: openjdk11
-
-- project:
-    name: dmaap-buscontroller-csit
-    jobs:
-      - "{project-name}-review-verification-maven-{stream}":
-          mvn-goals: clean install
-          mvn-params: "-P docker -DskipTests=true"
-      - "{project-name}-merge-verification-maven-{stream}":
-          mvn-goals: clean install
-          mvn-params: "-P docker -DskipTests=true"
-    project-name: "dmaap-buscontroller"
-    recipients: "fiachra.corcoran@est.tech"
-    project: "dmaap/buscontroller"
-    stream:
-      - "master":
-          branch: "master"
-    mvn-settings: "dmaap-buscontroller-settings"
-    robot-options: ""
-
-- project:
-    name: dmaap-buscontroller-sonar
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: "{sonarcloud_project_organization}"
-    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
-    sonar-mvn-goal: "{sonar_mvn_goal}"
-    build-node: ubuntu1804-builder-4c-4g
-    project: "dmaap/buscontroller"
-    project-name: "dmaap-buscontroller"
-    branch: "master"
-    mvn-settings: "dmaap-buscontroller-settings"
-    mvn-goals: "clean install"
-    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
-    java-version: openjdk11
-
-- project:
-    name: dmaap-buscontroller-clm
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: "onap-"
-    project: dmaap/buscontroller
-    project-name: "dmaap-buscontroller"
-    branch: "master"
-    mvn-settings: "dmaap-buscontroller-settings"
-    java-version: openjdk11

diff --git a/jjb/modeling/modeling-yang-kit.yaml b/jjb/modeling/modeling-yang-kit.yaml
new file mode 100644 (file)
index 0000000..3576405
--- /dev/null
+++ b/jjb/modeling/modeling-yang-kit.yaml
@@ -0,0 +1,59 @@
+---
+- project:
+    name: modeling-yang-kit
+    project-name: "modeling-yang-kit"
+    project: "modeling/yang-kit"
+    stream:
+      - "master":
+          branch: "master"
+    mvn-settings: "modeling-yang-kit-settings"
+    jobs:
+      - "{project-name}-{stream}-verify-java"
+      - "{project-name}-{stream}-merge-java"
+      - gerrit-maven-stage:
+          sbom-generator: true
+          sign-artifacts: true
+          build-node: centos8-docker-4c-4g
+          maven-versions-plugin: true
+      - gerrit-maven-docker-stage:
+          sbom-generator: true
+          build-node: ubuntu1804-docker-8c-8g
+          mvn-params: "-P docker -Dmaven.test.skip=true"
+          container-public-registry: "nexus3.onap.org:10001"
+          container-staging-registry: "nexus3.onap.org:10003"
+      - "{project-name}-gerrit-release-jobs":
+          build-node: centos7-docker-2c-1g
+    java-version: openjdk11
+    files: "**"
+    archive-artifacts: ""
+    docker-pom: "pom.xml"
+    build-node: ubuntu1804-builder-4c-4g
+
+- project:
+    name: modeling-yang-kit-sonar
+    jobs:
+      - gerrit-maven-sonar
+    sonarcloud: true
+    sonarcloud-project-organization: "{sonarcloud_project_organization}"
+    sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}"
+    sonar-mvn-goal: "{sonar_mvn_goal}"
+    cron: "@daily"
+    build-node: ubuntu1804-builder-4c-4g
+    project: "modeling/yang-kit"
+    project-name: "modeling-yang-kit"
+    branch: "master"
+    mvn-settings: "modeling-yang-kit-settings"
+    mvn-goals: "clean install"
+    mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
+
+- project:
+    name: modeling-yang-kit-clm
+    jobs:
+      - gerrit-maven-clm
+    nexus-iq-namespace: "onap-"
+    project: modeling/yang-kit
+    project-name: "modeling-yang-kit"
+    build-node: ubuntu1804-builder-4c-4g
+    branch: "master"
+    mvn-settings: "modeling-yang-kit-settings"
+    java-version: openjdk11

diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml
index bff1a37..2ef3a59 100644 (file)
--- a/jjb/policy/policy-apex-pdp.yaml
+++ b/jjb/policy/policy-apex-pdp.yaml
@@ -117,4 +117,5 @@
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-apex-pdp-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     java-version: openjdk17

diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml
index b37ee98..e467344 100644 (file)
--- a/jjb/policy/policy-api.yaml
+++ b/jjb/policy/policy-api.yaml
@@ -111,4 +111,5 @@
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-api-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     java-version: openjdk17

diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml
index 7f45cb6..3bba839 100644 (file)
--- a/jjb/policy/policy-clamp.yaml
+++ b/jjb/policy/policy-clamp.yaml
@@ -112,5 +112,6 @@
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-clamp-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     build-node: ubuntu1804-docker-8c-8g
     java-version: openjdk17

diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml
index 1b94e1e..2076a30 100644 (file)
--- a/jjb/policy/policy-common.yaml
+++ b/jjb/policy/policy-common.yaml
@@ -91,4 +91,5 @@
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-common-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     java-version: openjdk17

diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml
index 31875f0..49ce6b8 100644 (file)
--- a/jjb/policy/policy-distribution.yaml
+++ b/jjb/policy/policy-distribution.yaml
@@ -111,4 +111,5 @@
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-distribution-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     java-version: openjdk17

diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml
index 3d44a9c..a3fe3d8 100644 (file)
--- a/jjb/policy/policy-drools-applications.yaml
+++ b/jjb/policy/policy-drools-applications.yaml
@@ -113,6 +113,7 @@
           branch: "master"
     mvn-settings: "policy-drools-applications-settings"
     mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     mvn-version: "mvn36"
     maven-version: "mvn36"
     java-version: openjdk17

diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml
index 2b43375..148138a 100644 (file)
--- a/jjb/policy/policy-drools-pdp.yaml
+++ b/jjb/policy/policy-drools-pdp.yaml
@@ -112,4 +112,5 @@
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-drools-pdp-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     java-version: openjdk17

diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml
index 7041691..505d9f7 100644 (file)
--- a/jjb/policy/policy-gui.yaml
+++ b/jjb/policy/policy-gui.yaml
@@ -110,4 +110,5 @@
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-gui-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     java-version: openjdk17

diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml
index 696b788..49c1cca 100644 (file)
--- a/jjb/policy/policy-models.yaml
+++ b/jjb/policy/policy-models.yaml
@@ -111,4 +111,5 @@
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-models-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     java-version: openjdk17

diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml
index 3553efc..3b9f1b5 100644 (file)
--- a/jjb/policy/policy-pap.yaml
+++ b/jjb/policy/policy-pap.yaml
@@ -111,4 +111,5 @@
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-pap-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     java-version: openjdk17

diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml
index 3b67c44..c194f80 100644 (file)
--- a/jjb/policy/policy-parent.yaml
+++ b/jjb/policy/policy-parent.yaml
@@ -72,4 +72,5 @@
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-parent-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     java-version: openjdk17

diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml
index bb99ca5..a22effd 100644 (file)
--- a/jjb/policy/policy-xacml-pdp.yaml
+++ b/jjb/policy/policy-xacml-pdp.yaml
@@ -111,4 +111,5 @@
     mvn-version: "mvn36"
     maven-version: "mvn36"
     mvn-settings: "policy-xacml-pdp-settings"
+    mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED"
     java-version: openjdk17