From: Jessica Wagantall Date: Fri, 15 Jul 2022 16:58:12 +0000 (+0000) Subject: Merge "[DCAE] Switch to global jobs dcaegen2/platform with python sub-components" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c343a7ba14ce4ee19be7ac48aca03d06c415545f;hp=508157d66e284324106cb3573f96b49f246e1e7f;p=ci-management.git Merge "[DCAE] Switch to global jobs dcaegen2/platform with python sub-components" --- diff --git a/global-jjb b/global-jjb index fd0481da6..dad87a2bf 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit fd0481da698114d2032192796e61c198669cedb3 +Subproject commit dad87a2bfb60d4b90b7c224a7db589e67fa6df76 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg index 38273e129..2c9246e84 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-16g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20211012-214802.084 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220711-162121.038 LABELS=ubuntu1804-docker-8c-16g HARDWARE_ID=v3-standard-16 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg index 93b99f81d..5dd8647c6 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20211012-214802.084 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220711-162121.038 LABELS=ubuntu1804-docker-8c-8g HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg index b77319646..dbf3adca9 100644 --- a/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg +++ b/jenkins-config/clouds/openstack/cattle/ubuntu1804-docker-v1-8c-8g.cfg @@ -1,3 +1,3 @@ -IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20211012-214802.084 +IMAGE_NAME=ZZCI - Ubuntu 18.04 - docker - x86_64 - 20220711-162121.038 LABELS=ubuntu1804-docker-v1-8c-8g HARDWARE_ID=v3-standard-8 diff --git a/jenkins-config/managed-config-files/mavenSettings/usecase-ui-intent-analysis-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-intent-analysis-settings/config-params.yaml new file mode 100644 index 000000000..0d0370991 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-intent-analysis-settings/config-params.yaml @@ -0,0 +1,3 @@ +--- +name: "usecase-ui-intent-analysis-settings" +comment: "usecase-ui-intent-analysis-settings" diff --git a/jenkins-config/managed-config-files/mavenSettings/usecase-ui-intent-analysis-settings/content b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-intent-analysis-settings/content new file mode 120000 index 000000000..e830ebdd5 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-intent-analysis-settings/content @@ -0,0 +1 @@ +../../../managed-config-templates/mavenSettings-content \ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/usecase-ui-intent-analysis-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-intent-analysis-settings/serverCredentialMappings.sandbox.yaml new file mode 120000 index 000000000..8f9205792 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-intent-analysis-settings/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/usecase-ui-intent-analysis-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-intent-analysis-settings/serverCredentialMappings.yaml new file mode 100644 index 000000000..b5a6557b9 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-intent-analysis-settings/serverCredentialMappings.yaml @@ -0,0 +1,18 @@ +--- +serverCredentialMappings: + - serverId: "ecomp-snapshots" + credentialsId: &cred "usecase-ui-intent-analysis" + - serverId: "ecomp-site" + credentialsId: *cred + - serverId: "ecomp-staging" + credentialsId: *cred + - serverId: "nexus3.onap.org:10001" + credentialsId: "read-only-docker" + - serverId: "nexus3.onap.org:10002" + credentialsId: *cred + - serverId: "nexus3.onap.org:10003" + credentialsId: *cred + - serverId: "nexus3.onap.org:10004" + credentialsId: *cred + - serverId: "docker.io" + credentialsId: "onap_dockerhub_creds" diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 6236f65fc..68c84c901 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -15,6 +15,7 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + sbom-generator: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g project: 'aai/aai-common' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 62c32c95f..65a1731ae 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -16,6 +16,7 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + sbom-generator: true - gerrit-maven-docker-stage: mvn-params: '-P docker -B -Dmaven.test.skip=true -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn' build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 020bd1be0..aa56425f1 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -15,6 +15,7 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + sbom-generator: true - gerrit-maven-docker-stage: mvn-params: '-P docker -Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index 2b00eeba7..45c454db8 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -15,6 +15,7 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + sbom-generator: true - gerrit-maven-docker-stage: mvn-params: '-P docker -Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index 08b31bd6e..000e4098a 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -15,6 +15,7 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + sbom-generator: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g project: 'aai/logging-service' diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 669352172..fd656798c 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -16,6 +16,7 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + sbom-generator: true - gerrit-maven-docker-stage: mvn-params: '-P docker -B -Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 40477b180..878717385 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -18,6 +18,7 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + sbom-generator: true - gerrit-maven-docker-stage: mvn-params: '-P docker -Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 78442e2a4..8b80d6cd2 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -15,6 +15,7 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + sbom-generator: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g project: 'aai/rest-client' diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index b3c6767b3..23db9c4c2 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -15,6 +15,7 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + sbom-generator: true - gerrit-maven-docker-stage: mvn-params: '-P docker -Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index cd5ad1f41..a89af363a 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -16,6 +16,7 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + sbom-generator: true - gerrit-maven-docker-stage: mvn-params: '-f sparkybe-onap-application/pom.xml -P docker -B -Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index 036cb9966..aa3aa8d7e 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -9,6 +9,7 @@ - gerrit-maven-stage: build-node: ubuntu1804-builder-4c-4g maven-versions-plugin: true + sbom-generator: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g project: 'aai/sparky-fe' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 0542f988c..dce710e70 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -18,6 +18,7 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + sbom-generator: true - gerrit-maven-docker-stage: mvn-params: '-P docker -Dmaven.test.skip=true' build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 2044e818c..29b5e1251 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -19,6 +19,8 @@ sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' + sbom-generator: true + - gerrit-maven-docker-stage: container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' @@ -37,7 +39,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined @@ -65,7 +67,7 @@ project-name: 'ccsdk-apps' branch: 'master' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -85,7 +87,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' build-node: ubuntu1804-builder-4c-4g @@ -121,7 +123,7 @@ jobs: - gerrit-whitesource-scan java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index 88ccf2ee9..6b2b9822c 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -14,6 +14,7 @@ mvn-params: '-Dmaven.test.skip=true' mvn-opts: '-Ddocker.skip=true' cron: '' + sbom-generator: true - gerrit-maven-docker-stage: build-node: centos7-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -32,7 +33,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-oran-settings' files: '**' archive-artifacts: '' @@ -57,7 +58,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-oran-settings' mvn-opts: '-Ddocker.skip=true' build-node: centos7-builder-4c-4g @@ -85,7 +86,7 @@ project-name: 'ccsdk-oran' branch: 'master' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-oran-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index f0870f62d..426eea6db 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -13,6 +13,7 @@ sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' + sbom-generator: true - gerrit-maven-docker-stage: container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' @@ -31,7 +32,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-cds-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined @@ -70,7 +71,7 @@ - 'frankfurt': branch: 'frankfurt' java-version: openjdk8 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-cds-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined @@ -98,7 +99,7 @@ project-name: 'ccsdk-cds' branch: 'master' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-cds-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -118,7 +119,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-cds-settings' build-node: centos7-builder-4c-4g @@ -137,7 +138,7 @@ jobs: - gerrit-whitesource-scan java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-cds-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 265a69636..fac1cbe07 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -14,6 +14,7 @@ mvn-params: '-Dmaven.test.skip=true' maven-versions-plugin: true cron: '' + sbom-generator: true - gerrit-maven-docker-stage: build-node: centos7-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -33,7 +34,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' @@ -76,7 +77,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-distribution-settings' build-node: centos7-docker-8c-8g @@ -98,7 +99,7 @@ - gerrit-whitesource-scan: java-opts: '-Xmx2048m' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-distribution-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 27bddebd0..1d3f6cc30 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -13,6 +13,7 @@ sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' + sbom-generator: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -25,7 +26,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined @@ -54,7 +55,7 @@ project-name: 'ccsdk-features' branch: 'master' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' @@ -74,7 +75,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' build-node: centos7-builder-4c-4g @@ -95,7 +96,7 @@ jobs: - gerrit-whitesource-scan java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index fb6955209..14aaa4f6b 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -13,6 +13,7 @@ sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' + sbom-generator: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -38,7 +39,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-parent-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined @@ -65,7 +66,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-parent-settings' build-node: centos7-builder-4c-4g @@ -84,7 +85,7 @@ jobs: - gerrit-whitesource-scan java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-parent-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml index f0ac46b6a..36165e7fd 100644 --- a/jjb/ccsdk/sli.yaml +++ b/jjb/ccsdk/sli.yaml @@ -13,6 +13,7 @@ sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' + sbom-generator: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -25,7 +26,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-sli-settings' # due to a strange macro / variable translation problem this needs to be # passed as a string block to properly get the properties correctly defined @@ -53,7 +54,7 @@ project-name: 'ccsdk-sli' branch: 'master' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-sli-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' @@ -73,7 +74,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-sli-settings' build-node: centos7-builder-4c-4g @@ -92,7 +93,7 @@ jobs: - gerrit-whitesource-scan java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' mvn-settings: 'ccsdk-sli-settings' wss-product-name: ccsdk mvn-clean-install: true diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml index 3a47d4bde..edf6e3b1f 100644 --- a/jjb/cps/cps-ncmp-dmi-plugin.yaml +++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml @@ -30,6 +30,7 @@ sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true + sbom-generator: true - gerrit-maven-docker-stage: build-node: centos7-docker-8c-8g maven-versions-plugin: true diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml index f6049664c..d242d463f 100644 --- a/jjb/cps/cps.yaml +++ b/jjb/cps/cps.yaml @@ -43,6 +43,7 @@ sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true + sbom-generator: true - gerrit-maven-docker-stage: build-node: centos7-docker-8c-8g maven-versions-plugin: true diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index 1ee23bd40..74c90118b 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -17,6 +17,9 @@ container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g + mvn-settings: 'policy-docker-settings' + mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false" + java-version: openjdk11 project: 'policy/docker' stream: @@ -29,6 +32,8 @@ - 'jakarta': branch: 'jakarta' mvn-settings: 'policy-docker-settings' + mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false" + java-version: openjdk11 files: '**' archive-artifacts: '' build-node: ubuntu1804-builder-4c-4g @@ -50,6 +55,8 @@ - 'jakarta': branch: 'jakarta' mvn-settings: 'policy-docker-settings' + mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false" + java-version: openjdk11 - project: name: policy-docker-info diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index 2dcd0f42c..7bfdc8f8e 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -13,6 +13,12 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-docker-stage: + build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true + 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-8c-8g diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index efa64ec0f..732771735 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -22,6 +22,7 @@ sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' + sbom-generator: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -41,7 +42,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version : "mvn36" + mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' # due to a strange macro / variable translation problem this needs to be @@ -51,7 +52,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn36" + maven-version: "mvn38" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -71,11 +72,11 @@ project-name: 'sdnc-apps' branch: 'master' java-version: openjdk11 - mvn-version : "mvn36" + mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn36" + maven-version: "mvn38" # #- project: @@ -111,7 +112,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version : "mvn36" + mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' - project: diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 0da9c8ccb..6c834a01d 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -10,6 +10,7 @@ sign-artifacts: true build-node: centos7-builder-4c-4g cron: '' + sbom-generator: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -22,7 +23,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: "mvn36" + mvn-version: "mvn38" mvn-settings: 'sdnc-northbound-settings' # due to a strange macro / variable translation problem this needs to be @@ -32,7 +33,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn38" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -54,7 +55,7 @@ mvn-settings: 'sdnc-northbound-settings' mvn-goals: 'clean install' java-version: openjdk11 - mvn-version: "mvn36" + mvn-version: "mvn38" mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: @@ -74,7 +75,7 @@ branch: 'jakarta' mvn-settings: 'sdnc-northbound-settings' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' - project: name: sdnc-northbound-info diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index f38b1de4c..e09e3ec8b 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -13,6 +13,7 @@ sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' + sbom-generator: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -31,7 +32,7 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 - mvn-version: "mvn36" + mvn-version: "mvn38" mvn-settings: 'sdnc-oam-settings' files: '**' archive-artifacts: '' @@ -75,7 +76,7 @@ branch: 'jakarta' mvn-settings: 'sdnc-oam-settings' java-version: openjdk11 - mvn-version: 'mvn36' + mvn-version: 'mvn38' - project: name: sdnc-oam-info diff --git a/jjb/usecaseui/usecase-ui-intent-analysis.yaml b/jjb/usecaseui/usecase-ui-intent-analysis.yaml new file mode 100644 index 000000000..b6dcc2135 --- /dev/null +++ b/jjb/usecaseui/usecase-ui-intent-analysis.yaml @@ -0,0 +1,75 @@ +--- + +- project: + name: usecase-ui-intent-analysis + project-name: 'usecase-ui-intent-analysis' + project: 'usecase-ui/intent-analysis' + stream: + - 'master': + branch: 'master' + - 'kohn': + branch: 'kohn' + mvn-settings: 'usecase-ui-intent-analysis-settings' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-builder-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + 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-8c-8g + java-version: openjdk11 + files: '**' + archive-artifacts: '' + docker-pom: 'pom.xml' + build-node: ubuntu1804-builder-4c-4g + +- project: + name: usecase-ui-intent-analysis-sonar + jobs: + - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: '{sonar_mvn_goal}' + cron: '@daily' + build-node: ubuntu1804-builder-4c-4g + project: 'usecase-ui/intent-analysis' + project-name: 'usecase-ui-intent-analysis' + branch: 'master' + mvn-settings: 'usecase-ui-intent-analysis-settings' + java-version: openjdk11 + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: usecase-ui-intent-analysis-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: usecase-ui/intent-analysis + project-name: 'usecase-ui-intent-analysis' + build-node: ubuntu1804-builder-4c-4g + stream: + - 'master': + branch: 'master' + - 'kohn': + branch: 'kohn' + mvn-settings: 'usecase-ui-intent-analysis-settings' + java-version: openjdk11 + +- project: + name: usecase-ui-intent-analysis-info + project-name: usecase-ui-intent-analysis + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: usecase-ui/intent-analysis + branch: master diff --git a/packer/provision/local-docker.yaml b/packer/provision/local-docker.yaml index b2b0a52b5..869202d75 100644 --- a/packer/provision/local-docker.yaml +++ b/packer/provision/local-docker.yaml @@ -6,7 +6,7 @@ become_method: sudo vars: apt_file: /etc/apt/sources.list.d/google-chrome.list - docker_compose_version: 1.17.1 + docker_compose_version: 1.29.2 glide_checksum: sha256:c403933503ea40308ecfadcff581ff0dc3190c57958808bb9eed016f13f6f32c glide_version: v0.13.1 golang_version: 1.9.1 @@ -233,26 +233,15 @@ become: true when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' - - name: Clone rebar3 - git: - repo: 'https://github.com/erlang/rebar3.git' - dest: /tmp/rebar3 - version: v3.13 - when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' - - - name: Install rebar3 to bin - copy: - src: /tmp/rebar3/rebar3 - dest: /usr/bin/rebar3 - mode: 0755 - remote_src: true + - name: 'Download latest rebar3 bin' + command: curl -o /usr/bin/rebar3 -L "https://s3.amazonaws.com/rebar3/rebar3" become: true when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' - - name: Remove unused rebar3 source - file: - path: /tmp/rebar3 - state: absent + - file: + path: /usr/bin/rebar3 + mode: "+x" + become: true when: ansible_architecture == 'x86_64' and ansible_distribution == 'Ubuntu' - name: Download geckodriver