Merge "Chore: Update sub-projects to latest CSIT/robots"
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/config-params.yaml
new file mode 100644
index 0000000..f294117
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/config-params.yaml
@@ -0,0 +1,3 @@
+---
+name: "portal-ng-history"
+comment: "portal-ng-history"
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/content b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/content
new file mode 120000
index 0000000..e830ebd
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/content
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.sandbox.yaml
new file mode 120000
index 0000000..8f92057
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.sandbox.yaml
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.yaml
new file mode 100644
index 0000000..4c5895e
--- /dev/null
+++ b/jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.yaml
@@ -0,0 +1,18 @@
+---
+serverCredentialMappings:
+ - serverId: "ecomp-snapshots"
+ credentialsId: "portal-ng-history"
+ - serverId: "ecomp-site"
+ credentialsId: "portal-ng-history"
+ - serverId: "ecomp-staging"
+ credentialsId: "portal-ng-history"
+ - serverId: "nexus3.onap.org:10001"
+ credentialsId: "portal-ng-history"
+ - serverId: "nexus3.onap.org:10002"
+ credentialsId: "portal-ng-history"
+ - serverId: "nexus3.onap.org:10003"
+ credentialsId: "portal-ng-history"
+ - serverId: "nexus3.onap.org:10004"
+ credentialsId: "portal-ng-history"
+ - serverId: "docker.io"
+ credentialsId: "onap_dockerhub_creds"
\ No newline at end of file
diff --git a/jjb/integration/docker/integration-docker-onap-java11.yaml b/jjb/integration/docker/integration-docker-onap-java11.yaml
index 4ad47ab..5074a0c 100644
--- a/jjb/integration/docker/integration-docker-onap-java11.yaml
+++ b/jjb/integration/docker/integration-docker-onap-java11.yaml
@@ -1,7 +1,7 @@
---
- project:
- name: integration-docker-onap-java11-info
- project-name: integration-docker-onap-java11
+ name: integration-docker-onap-java-info
+ project-name: integration-docker-onap-java
jobs:
- gerrit-info-yaml-verify
build-node: centos7-builder-2c-1g
@@ -9,9 +9,9 @@
branch: master
- project:
- name: integration-docker-onap-java11-linters
+ name: integration-docker-onap-java-linters
project: integration/docker/onap-java11
- project-name: integration-docker-onap-java11
+ project-name: integration-docker-onap-java
python-version: python3
jobs:
- integration-linters
@@ -37,8 +37,8 @@
branch: 'master'
- project:
- name: integration-docker-onap-java11-release
- project-name: 'integration-docker-onap-java11'
+ name: integration-docker-onap-java-release
+ project-name: 'integration-docker-onap-java'
project: 'integration/docker/onap-java11'
mvn-settings: 'integration-settings'
jobs:
@@ -46,18 +46,27 @@
build-node: centos7-docker-8c-8g
- project:
- name: 'integration-docker-onap-java11-docker'
+ name: 'integration-docker-onap-java-docker'
jobs:
- - gerrit-docker-verify
- - gerrit-docker-merge
- project-name: 'integration-docker-onap-java11'
+ - gerrit-docker-verify:
+ project-name: 'integration-docker-onap-java11'
+ docker-name: 'onap/integration-java11'
+ - gerrit-docker-merge:
+ project-name: 'integration-docker-onap-java11'
+ docker-name: 'onap/integration-java11'
+ - gerrit-docker-verify:
+ project-name: 'integration-docker-onap-java17'
+ docker-name: 'onap/integration-java17'
+ docker-build-args: '--build-arg java_ver=onap-java17'
+ - gerrit-docker-merge:
+ project-name: 'integration-docker-onap-java17'
+ docker-name: 'onap/integration-java17'
+ docker-build-args: '--build-arg java_ver=onap-java17'
project: 'integration/docker/onap-java11'
stream:
- 'master':
branch: 'master'
files: ''
- docker-name: 'onap/integration-java11'
- docker-build-args: '-f ./Dockerfile'
docker-root: '$WORKSPACE'
mvn-settings: 'integration-settings'
build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml
index 77be42b..34e3ed6 100644
--- a/jjb/integration/integration-templates.yaml
+++ b/jjb/integration/integration-templates.yaml
@@ -57,7 +57,7 @@
id: integration-linters
project-type: freestyle
description: 'Job intended for running linters with Tox and Coala'
- build-node: ubuntu1804-builder-4c-4g
+ build-node: centos8-builder-2c-1g
node: '{build-node}'
parameters:
diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml
index 9edde3d..4a0736d 100644
--- a/jjb/policy/policy-csit.yaml
+++ b/jjb/policy/policy-csit.yaml
@@ -28,8 +28,6 @@
jobs:
- '{project-name}-{stream}-project-csit-verify-{functionality}'
- '{project-name}-{stream}-project-csit-{functionality}'
- - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
- - '{project-name}-{stream}-project-k8s-csit-{functionality}'
project-name: 'policy-xacml-pdp'
recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
project: 'policy/docker'
@@ -80,8 +78,6 @@
jobs:
- '{project-name}-{stream}-project-csit-verify-{functionality}'
- '{project-name}-{stream}-project-csit-{functionality}'
- - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
- - '{project-name}-{stream}-project-k8s-csit-{functionality}'
project-name: 'policy-drools-pdp'
recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
project: 'policy/docker'
@@ -107,8 +103,6 @@
jobs:
- '{project-name}-{stream}-project-csit-verify-{functionality}'
- '{project-name}-{stream}-project-csit-{functionality}'
- - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
- - '{project-name}-{stream}-project-k8s-csit-{functionality}'
project-name: 'policy-apex-pdp'
recipients: 'liam.fallon@est.tech ram_krishna.verma@bell.ca'
project: 'policy/docker'
@@ -134,8 +128,6 @@
jobs:
- '{project-name}-{stream}-project-csit-verify-{functionality}'
- '{project-name}-{stream}-project-csit-{functionality}'
- - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
- - '{project-name}-{stream}-project-k8s-csit-{functionality}'
project-name: 'policy-pap'
recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
project: 'policy/docker'
@@ -161,8 +153,6 @@
jobs:
- '{project-name}-{stream}-project-csit-verify-{functionality}'
- '{project-name}-{stream}-project-csit-{functionality}'
- - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
- - '{project-name}-{stream}-project-k8s-csit-{functionality}'
project-name: 'policy-api'
recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
project: 'policy/docker'
@@ -188,10 +178,8 @@
jobs:
- '{project-name}-{stream}-project-csit-verify-{functionality}'
- '{project-name}-{stream}-project-csit-{functionality}'
- - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
- - '{project-name}-{stream}-project-k8s-csit-{functionality}'
project-name: 'policy-clamp'
- recipients: 'jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech ajith.sreekumar@est.tech pd1248@att.com'
+ recipients: 'jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com'
project: 'policy/docker'
stream:
- 'master':
diff --git a/jjb/policy/policy-k8s-csit.yaml b/jjb/policy/policy-k8s-csit.yaml
new file mode 100644
index 0000000..e02b6c2
--- /dev/null
+++ b/jjb/policy/policy-k8s-csit.yaml
@@ -0,0 +1,101 @@
+- project:
+ name: policy-xacml-pdp-project-k8s-csit
+ jobs:
+ - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+ - '{project-name}-{stream}-project-k8s-csit-{functionality}'
+ project-name: 'policy-xacml-pdp'
+ recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
+ project: 'policy/docker'
+ stream:
+ - 'master':
+ branch: 'master'
+ functionality:
+ - 'xacml-pdp'
+ trigger_jobs:
+ - 'policy-xacml-pdp-{stream}-merge-java'
+ - 'policy-docker-{stream}-merge-java'
+
+- project:
+ name: policy-drools-pdp-project-k8s-csit
+ jobs:
+ - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+ - '{project-name}-{stream}-project-k8s-csit-{functionality}'
+ project-name: 'policy-drools-pdp'
+ recipients: 'jrh3@att.com jorge.hernandez-herrero@att.com'
+ project: 'policy/docker'
+ stream:
+ - 'master':
+ branch: 'master'
+ functionality:
+ - 'drools-pdp'
+ trigger_jobs:
+ - 'policy-drools-pdp-{stream}-merge-java'
+ - 'policy-docker-{stream}-merge-java'
+
+- project:
+ name: policy-apex-pdp-project-k8s-csit
+ jobs:
+ - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+ - '{project-name}-{stream}-project-k8s-csit-{functionality}'
+ project-name: 'policy-apex-pdp'
+ recipients: 'liam.fallon@est.tech ram_krishna.verma@bell.ca'
+ project: 'policy/docker'
+ stream:
+ - 'master':
+ branch: 'master'
+ functionality:
+ - 'apex-pdp'
+ trigger_jobs:
+ - 'policy-apex-pdp-{stream}-merge-java'
+ - 'policy-docker-{stream}-merge-java'
+
+- project:
+ name: policy-pap-project-k8s-csit
+ jobs:
+ - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+ - '{project-name}-{stream}-project-k8s-csit-{functionality}'
+ project-name: 'policy-pap'
+ recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
+ project: 'policy/docker'
+ stream:
+ - 'master':
+ branch: 'master'
+ functionality:
+ - 'pap'
+ trigger_jobs:
+ - 'policy-pap-{stream}-merge-java'
+ - 'policy-docker-{stream}-merge-java'
+
+- project:
+ name: policy-api-project-k8s-csit
+ jobs:
+ - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+ - '{project-name}-{stream}-project-k8s-csit-{functionality}'
+ project-name: 'policy-api'
+ recipients: 'jrh3@att.com ram_krishna.verma@bell.ca'
+ project: 'policy/docker'
+ stream:
+ - 'master':
+ branch: 'master'
+ functionality:
+ - 'api'
+ trigger_jobs:
+ - 'policy-api-{stream}-merge-java'
+ - 'policy-docker-{stream}-merge-java'
+
+- project:
+ name: policy-clamp-project-k8s-csit
+ jobs:
+ - '{project-name}-{stream}-project-k8s-csit-verify-{functionality}'
+ - '{project-name}-{stream}-project-k8s-csit-{functionality}'
+ project-name: 'policy-clamp'
+ recipients: 'jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech pd1248@att.com'
+ project: 'policy/docker'
+ stream:
+ - 'master':
+ branch: 'master'
+ functionality:
+ - 'clamp'
+ trigger_jobs:
+ - 'policy-clamp-{stream}-merge-java'
+ - 'policy-docker-{stream}-merge-java'
diff --git a/jjb/portal-ng-history/portal-ng-history.yaml b/jjb/portal-ng-history/portal-ng-history.yaml
new file mode 100644
index 0000000..b711bb4
--- /dev/null
+++ b/jjb/portal-ng-history/portal-ng-history.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+ name: portal-ng-history-project-view
+ project-name: portal-ng-history
+ views:
+ - project-view
+
+- project:
+ name: portal-ng-history-info
+ project: portal-ng/history
+ project-name: portal-ng-history
+ build-node: centos8-builder-2c-1g
+ branch: master
+ jobs:
+ - gerrit-info-yaml-verify
\ No newline at end of file
diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml
deleted file mode 100644
index 3798685..0000000
--- a/jjb/sdc/sdc-sdc-docker-base.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-
-- project:
- name: sdc-sdc-docker-base
- project-name: 'sdc-sdc-docker-base'
- jobs:
- - '{project-name}-{stream}-verify-java':
- build-node: 'ubuntu1804-docker-v1-8c-8g'
- docker-pom: 'pom.xml'
- - '{project-name}-{stream}-sdc-merge-java':
- build-node: 'ubuntu1804-docker-8c-8g'
- docker-pom: 'pom.xml'
- mvn-profile: 'default'
- - gerrit-maven-docker-stage:
- sbom-generator: true
- build-node: ubuntu1804-docker-8c-8g
- maven-versions-plugin: true
- mvn-params: '-P default'
- container-public-registry: 'nexus3.onap.org:10001'
- container-staging-registry: 'nexus3.onap.org:10003'
- - '{project-name}-gerrit-release-jobs':
- build-node: centos7-docker-8c-8g
- project: 'sdc/sdc-docker-base'
- stream:
- - 'master':
- branch: 'master'
- - 'jakarta':
- branch: 'jakarta'
- - 'kohn':
- branch: 'kohn'
- mvn-settings: 'sdc-sdc-docker-base-settings'
- files: '**'
- archive-artifacts: ''
- build-node: ubuntu1804-builder-4c-4g
- maven-version: 'mvn36'
-
-- project:
- name: sdc-sdc-docker-base-info
- project-name: sdc-sdc-docker-base
- jobs:
- - gerrit-info-yaml-verify
- build-node: centos7-builder-2c-1g
- project: sdc/sdc-docker-base
- branch: master
diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml
index ea3db29..663656b 100644
--- a/jjb/so/so-adapters-so-cnf-adapter.yaml
+++ b/jjb/so/so-adapters-so-cnf-adapter.yaml
@@ -59,3 +59,17 @@
mvn-settings: 'so-adapters-so-cnf-adapter-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: so-adapters-so-cnf-adapter-clm
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: 'onap-'
+ project: 'so/adapters/so-cnf-adapter'
+ project-name: 'so-adapters-so-cnf-adapter'
+ build-node: ubuntu1804-docker-v1-8c-8g
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'so-adapters-so-cnf-adapter-settings'
diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
index cb16d5c..bb54fd5 100644
--- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
+++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml
@@ -59,3 +59,18 @@
mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+
+- project:
+ name: so-adapters-so-etsi-sol005-adapter-clm
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: 'onap-'
+ project: 'so/adapters/so-etsi-sol005-adapter'
+ project-name: 'so-adapters-so-etsi-sol005-adapter'
+ build-node: ubuntu1804-docker-v1-8c-8g
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'so-adapters-so-etsi-sol005-adapter-settings'
diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml
index 5a37cf6..d52f40f 100644
--- a/jjb/so/so-adapters-so-oof-adapter.yaml
+++ b/jjb/so/so-adapters-so-oof-adapter.yaml
@@ -59,3 +59,17 @@
mvn-settings: 'so-adapters-so-oof-adapter-settings'
mvn-goals: 'clean install'
mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
+
+- project:
+ name: so-adapters-so-oof-adapter-clm
+ java-version: openjdk11
+ jobs:
+ - gerrit-maven-clm
+ nexus-iq-namespace: 'onap-'
+ project: 'so/adapters/so-oof-adapter'
+ project-name: 'so-adapters-so-oof-adapter'
+ build-node: ubuntu1804-docker-v1-8c-8g
+ stream:
+ - 'master':
+ branch: 'master'
+ mvn-settings: 'so-adapters-so-oof-adapter-settings'
diff --git a/packer/templates/helm.json b/packer/templates/helm.json
index cdf752a..ac824ce 100644
--- a/packer/templates/helm.json
+++ b/packer/templates/helm.json
@@ -42,9 +42,7 @@
"provisioners": [
{
"type": "shell",
- "scripts": [
- "common-packer/provision/install-python.sh"
- ],
+ "scripts": ["common-packer/provision/install-python.sh"],
"execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
},
{
@@ -53,6 +51,8 @@
},
{
"type": "ansible",
+ "command": "./common-packer/ansible-playbook.sh",
+ "skip_version_check": true,
"playbook_file": "provision/helm.yaml",
"ansible_env_vars": [
"ANSIBLE_NOCOWS=1",
diff --git a/packer/templates/redis.json b/packer/templates/redis.json
index 6bf7b17..657f109 100644
--- a/packer/templates/redis.json
+++ b/packer/templates/redis.json
@@ -39,9 +39,7 @@
"provisioners": [
{
"type": "shell",
- "scripts": [
- "common-packer/provision/install-python.sh"
- ],
+ "scripts": ["common-packer/provision/install-python.sh"],
"execute_command": "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
},
{
@@ -50,6 +48,8 @@
},
{
"type": "ansible",
+ "command": "./common-packer/ansible-playbook.sh",
+ "skip_version_check": true,
"playbook_file": "provision/redis.yaml",
"ansible_env_vars": [
"ANSIBLE_NOCOWS=1",