diff options
Diffstat (limited to 'jjb')
165 files changed, 1061 insertions, 812 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index bca81a1cb..e52ceb98f 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - '{project-name}-gerrit-release-jobs': diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index a184d51bf..e66bf18a9 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -14,7 +14,7 @@ cron: '@daily' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 0f938b4c0..dfa92c6f5 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index 1e051ea74..f3ce0922f 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index 87f607d1d..cd37af33a 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - '{project-name}-gerrit-release-jobs': diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index d86b6db2d..d425da51b 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -14,7 +14,7 @@ cron: '@daily' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 5a4f5e88d..aad11fe55 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -16,7 +16,7 @@ - gerrit-maven-stage: mvn-params: '-DskipTests' sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index e4a7cea1e..2bb012766 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - '{project-name}-gerrit-release-jobs': diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 44925875c..4f20596c1 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 6e3979739..866ff679f 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -14,7 +14,7 @@ cron: '@daily' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 1e2fc21df..b8bb13d70 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -16,7 +16,7 @@ - gerrit-maven-stage: mvn-params: '-DskipTests' sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 40d57d014..423e4af45 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -15,11 +15,11 @@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' - sbom-generator: false + sbom-generator: true - gerrit-maven-docker-stage: container-public-registry: 'nexus3.onap.org:10001' @@ -28,17 +28,16 @@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos8-docker-8c-8g + build-node: centos7-docker-2c-8g project: 'ccsdk/apps' stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk17 - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' # due to a strange macro / variable translation problem this needs to be @@ -69,7 +68,7 @@ mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: ccsdk-apps-clm @@ -84,6 +83,7 @@ java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-apps-settings' + mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED' build-node: ubuntu1804-builder-4c-4g #- project: diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index bfebf74e4..11c537411 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' - 'kohn': branch: 'kohn' mvn-settings: 'ccsdk-distribution-settings' @@ -37,10 +35,10 @@ project: 'ccsdk/oran' stream: - 'master': + java-version: openjdk17 branch: 'master' - - 'jakarta': - branch: 'jakarta' - 'kohn': + java-version: openjdk11 branch: 'kohn' mvn-settings: 'ccsdk-oran-settings' mvn-version: 'mvn38' diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index 6b499393e..38171860b 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -9,12 +9,12 @@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' mvn-opts: '-Ddocker.skip=true' cron: '' - sbom-generator: false + sbom-generator: true - gerrit-maven-docker-stage: build-node: centos8-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -23,16 +23,15 @@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos8-docker-8c-8g + build-node: centos7-docker-2c-8g project: 'ccsdk/oran' stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk17 - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 mvn-version: 'mvn38' mvn-settings: 'ccsdk-oran-settings' files: '**' @@ -56,7 +55,7 @@ java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-oran-settings' - mvn-opts: '-Ddocker.skip=true' + mvn-opts: '-Ddocker.skip=true --add-opens=java.base/java.util=ALL-UNNAMED' build-node: centos8-builder-4c-4g - project: @@ -87,6 +86,6 @@ mvn-version: 'mvn38' mvn-settings: 'ccsdk-oran-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' mvn-opts: '-Ddocker.skip=true' mvn-params: '-f a1-policy-management' diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index a0447dbb6..aaaef80b0 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -1,6 +1,6 @@ --- - project: - name: ccsdk-cds-java11 + name: ccsdk-cds-java17 project-name: 'ccsdk-cds' jobs: - gerrit-maven-verify: @@ -9,11 +9,11 @@ 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' cron: '' - sbom-generator: false + sbom-generator: true - gerrit-maven-docker-stage: container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' @@ -27,11 +27,10 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk17 - 'kohn': branch: 'kohn' - java-version: openjdk11 + java-version: openjdk11 mvn-version: 'mvn38' mvn-settings: 'ccsdk-cds-settings' # due to a strange macro / variable translation problem this needs to be @@ -41,7 +40,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -97,11 +96,11 @@ project: 'ccsdk/cds' project-name: 'ccsdk-cds' branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-cds-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: ccsdk-cds-clm @@ -113,9 +112,10 @@ stream: - 'master': branch: 'master' - java-version: openjdk11 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-cds-settings' + mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED' build-node: centos8-builder-4c-4g - project: diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 26eb0b6ee..c409ef0ef 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -9,12 +9,12 @@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' maven-versions-plugin: true cron: '' - sbom-generator: false + sbom-generator: true - gerrit-maven-docker-stage: build-node: centos8-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -23,17 +23,16 @@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos8-docker-8c-8g + build-node: centos7-docker-2c-8g project: 'ccsdk/distribution' stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk11 - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-distribution-settings' files: '**' @@ -75,6 +74,7 @@ java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-distribution-settings' + mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED' build-node: centos8-docker-8c-8g diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 4a2ba1df5..60d6f673d 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -9,23 +9,24 @@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' - sbom-generator: false + sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos8-docker-8c-8g + build-node: centos7-docker-2c-8g project: 'ccsdk/features' stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk17 + mvn-opts: '-Xmx3072m' - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 + mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' # due to a strange macro / variable translation problem this needs to be @@ -35,7 +36,6 @@ deployAtEnd=true files: '**' archive-artifacts: '' - mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' build-node: centos8-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -57,7 +57,7 @@ mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' + mvn-opts: '-Xmx3072m' - project: name: ccsdk-features-clm @@ -72,7 +72,7 @@ java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-features-settings' - mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' + mvn-opts: '-Xmx3072m --add-opens=java.base/java.util=ALL-UNNAMED' build-node: centos8-builder-4c-4g - project: diff --git a/jjb/ccsdk/odl-legacy.yaml b/jjb/ccsdk/odl-legacy.yaml index 21036bcf1..ea8331ba4 100644 --- a/jjb/ccsdk/odl-legacy.yaml +++ b/jjb/ccsdk/odl-legacy.yaml @@ -15,11 +15,11 @@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' - sbom-generator: false + sbom-generator: true - '{project-name}-gerrit-release-jobs': build-node: centos8-docker-8c-8g @@ -58,7 +58,7 @@ mvn-version: 'mvn38' mvn-settings: 'ccsdk-odl-legacy-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: ccsdk-odl-legacy-clm @@ -73,6 +73,7 @@ java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-odl-legacy-settings' + mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED' build-node: centos8-builder-4c-4g diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 2a8cc5e68..eedabbea1 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -9,13 +9,13 @@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' - sbom-generator: false + sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos8-docker-8c-8g + build-node: centos7-docker-2c-8g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -23,6 +23,7 @@ stream: - 'master': branch: 'master' + java-version: openjdk17 jobs: - gerrit-maven-verify: mvn-params: '-Drevision=3.0.0-SNAPSHOT' @@ -32,11 +33,9 @@ mvn-params: '-Dmaven.test.skip=true -Drevision=3.0.0' - '{project-name}-gerrit-release-jobs': mvn-params: '-Drevision=3.0.0' - - 'jakarta': - branch: 'jakarta' - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 mvn-version: 'mvn38' mvn-settings: 'ccsdk-parent-settings' # due to a strange macro / variable translation problem this needs to be @@ -60,6 +59,7 @@ java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-parent-settings' + mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED' build-node: centos8-builder-4c-4g - project: diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml index 51407c2d9..c9efc9099 100644 --- a/jjb/ccsdk/sli.yaml +++ b/jjb/ccsdk/sli.yaml @@ -9,23 +9,22 @@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' - sbom-generator: false + sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos8-docker-8c-8g + build-node: centos7-docker-2c-8g project: 'ccsdk/sli' stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk17 - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 mvn-version: 'mvn38' mvn-settings: 'ccsdk-sli-settings' # due to a strange macro / variable translation problem this needs to be @@ -56,7 +55,7 @@ mvn-version: 'mvn38' mvn-settings: 'ccsdk-sli-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: ccsdk-sli-clm @@ -71,6 +70,7 @@ java-version: openjdk17 mvn-version: 'mvn38' mvn-settings: 'ccsdk-sli-settings' + mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED' build-node: centos8-builder-4c-4g - project: diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml index 74c9f96f3..a589c6115 100644 --- a/jjb/ci-management/ci-management-packer-jobs.yaml +++ b/jjb/ci-management/ci-management-packer-jobs.yaml @@ -10,7 +10,7 @@ branch: master archive-artifacts: '**/*.log' - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g build-timeout: 90 platforms: @@ -32,7 +32,7 @@ branch: master archive-artifacts: '**/*.log' - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g build-timeout: 90 platforms: @@ -56,7 +56,7 @@ branch: master archive-artifacts: '**/*.log' - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g build-timeout: 90 platforms: @@ -76,7 +76,7 @@ branch: master archive-artifacts: '**/*.log' - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g platforms: - centos-7 @@ -95,7 +95,7 @@ branch: master archive-artifacts: '**/*.log' - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g platforms: - ubuntu-18.04 diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index f6000c706..9a644623a 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -10,7 +10,7 @@ project-name: ci-management jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: ci-management branch: master @@ -29,7 +29,7 @@ archive-artifacts: '**/*.log' branch: 'master' build-timeout: '60' - build-node: 'centos7-builder-2c-1g' + build-node: 'centos8-builder-2c-1g' jjb-version: 4.1.0 # configure the gerrit-jjb-verify job build-node-label-check: true @@ -42,7 +42,7 @@ project: ci-management project-name: ci-management - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jenkins-urls: > https://jenkins.onap.org @@ -60,7 +60,7 @@ archive-artifacts: '**/*.log' jenkins-ssh-credential: "{jenkins-ssh-credential}" - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g # update-cloud-image: true build-timeout: 10 diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index 8733f3d63..bec379519 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -14,11 +14,11 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-params: '-Dskip.docker.build=false -Dskip.docker.push=false -Dskip.docker.tag=false -Ddocker.push.registry=nexus3.onap.org:10003' container-public-registry: 'nexus3.onap.org:10001' @@ -93,7 +93,7 @@ project-name: cli jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: cli branch: master diff --git a/jjb/cps/cps-cps-tbdmt.yaml b/jjb/cps/cps-cps-tbdmt.yaml index 1743613ed..60b4758b3 100644 --- a/jjb/cps/cps-cps-tbdmt.yaml +++ b/jjb/cps/cps-cps-tbdmt.yaml @@ -9,7 +9,7 @@ name: cps-tbdmt-info project: cps/cps-tbdmt project-name: cps-cps-tbdmt - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -25,7 +25,7 @@ project-name: cps-cps-tbdmt branch: 'master' mvn-settings: 'cps-cps-tbdmt-settings' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g - project: name: cps-tbdmt @@ -42,10 +42,10 @@ - gerrit-maven-merge - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker' container-public-registry: 'nexus3.onap.org:10001' @@ -58,7 +58,7 @@ mvn-settings: 'cps-cps-tbdmt-settings' files: '**' archive-artifacts: '' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g - project: name: cps-tbdmt-sonar @@ -72,7 +72,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'cps/cps-tbdmt' project-name: 'cps-cps-tbdmt' branch: 'master' @@ -92,7 +92,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonarcloud-qualitygate-wait: true sonar-mvn-goal: '{sonar_mvn_goal}' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'cps/cps-tbdmt' project-name: 'cps-cps-tbdmt' branch: 'master' diff --git a/jjb/cps/cps-cps-temporal.yaml b/jjb/cps/cps-cps-temporal.yaml index 75e931390..f2115e245 100644 --- a/jjb/cps/cps-cps-temporal.yaml +++ b/jjb/cps/cps-cps-temporal.yaml @@ -9,7 +9,7 @@ name: cps-cps-temporal-info project: cps/cps-temporal project-name: cps-cps-temporal - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -29,7 +29,7 @@ container-public-registry: nexus3.onap.org:10001 container-snapshot-registry: nexus3.onap.org:10003 - gerrit-maven-docker-stage: - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-params: -Pdocker container-public-registry: nexus3.onap.org:10001 @@ -48,7 +48,7 @@ mvn-settings: cps-cps-temporal-settings files: '**' archive-artifacts: '' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g - project: name: cps-cps-temporal-clm @@ -62,7 +62,7 @@ project-name: cps-cps-temporal branch: master mvn-settings: cps-cps-temporal-settings - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g - project: name: cps-cps-temporal-sonar @@ -76,7 +76,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'cps/cps-temporal' project-name: 'cps-cps-temporal' branch: 'master' @@ -96,7 +96,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonarcloud-qualitygate-wait: true sonar-mvn-goal: '{sonar_mvn_goal}' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'cps/cps-temporal' project-name: 'cps-cps-temporal' branch: 'master' diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml index 7ec0f7573..61a4e2e18 100644 --- a/jjb/cps/cps-ncmp-dmi-plugin.yaml +++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml @@ -9,7 +9,7 @@ name: cps-ncmp-dmi-plugin-info project: cps/ncmp-dmi-plugin project-name: cps-ncmp-dmi-plugin - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -28,11 +28,11 @@ - gerrit-maven-merge - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-params: -Pdocker container-public-registry: nexus3.onap.org:10001 @@ -51,7 +51,7 @@ mvn-settings: cps-ncmp-dmi-plugin-settings files: '**' archive-artifacts: '' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g - project: name: cps-ncmp-dmi-plugin-clm @@ -65,7 +65,7 @@ project-name: cps-ncmp-dmi-plugin branch: master mvn-settings: cps-ncmp-dmi-plugin-settings - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g - project: name: cps-ncmp-dmi-plugin-sonar @@ -79,7 +79,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'cps/ncmp-dmi-plugin' project-name: 'cps-ncmp-dmi-plugin' branch: 'master' @@ -99,7 +99,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonarcloud-qualitygate-wait: true sonar-mvn-goal: '{sonar_mvn_goal}' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'cps/ncmp-dmi-plugin' project-name: 'cps-ncmp-dmi-plugin' branch: 'master' diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml index 914756570..a56a50ea7 100644 --- a/jjb/cps/cps.yaml +++ b/jjb/cps/cps.yaml @@ -9,7 +9,7 @@ name: cps-info project: cps project-name: cps - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -25,7 +25,7 @@ project-name: 'cps' branch: 'master' mvn-settings: 'cps-settings' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g - project: name: cps @@ -41,11 +41,11 @@ mvn-params: "-P cps-ncmp-docker" - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true sbom-generator: true - gerrit-maven-docker-stage: - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-params: '-P cps-ncmp-docker' container-public-registry: 'nexus3.onap.org:10001' @@ -64,7 +64,7 @@ mvn-settings: 'cps-settings' files: '**' archive-artifacts: '' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g - project: name: cps-sonar @@ -78,7 +78,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'cps' project-name: 'cps' branch: 'master' @@ -98,7 +98,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonarcloud-qualitygate-wait: true sonar-mvn-goal: '{sonar_mvn_goal}' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'cps' project-name: 'cps' branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-analytics-flink.yaml b/jjb/dcaegen2/dcaegen2-analytics-flink.yaml index 9d76d41cf..6b9321cfa 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-flink.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-flink.yaml @@ -4,6 +4,6 @@ project-name: dcaegen2-analytics-flink jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/analytics/flink branch: master diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index c4d612659..68d39e926 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -17,7 +17,7 @@ - gerrit-maven-stage: sign-artifacts: true sbom-generator: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true project: 'dcaegen2/analytics/tca-gen2' # job template iterators @@ -81,6 +81,6 @@ project-name: dcaegen2-analytics-tca-gen2 jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/analytics/tca-gen2 branch: master diff --git a/jjb/dcaegen2/dcaegen2-analytics.yaml b/jjb/dcaegen2/dcaegen2-analytics.yaml index 80ac689d1..aa6649543 100644 --- a/jjb/dcaegen2/dcaegen2-analytics.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics.yaml @@ -4,6 +4,6 @@ project-name: dcaegen2-analytics jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/analytics branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml index f2f6621d0..85252e04d 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -28,7 +28,7 @@ - gerrit-maven-stage: sign-artifacts: true sbom-generator: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -75,6 +75,6 @@ project-name: dcaegen2-collectors-datafile jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dcaegen2/collectors/datafile branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml deleted file mode 100644 index 8b94b21b1..000000000 --- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml +++ /dev/null @@ -1,107 +0,0 @@ ---- -- job-group: - # This job group contains all the jobs that should be deployed for - # a subproject of dcaegen2/platform that builds a Docker image from - # Python code. - # - # Required parameters: - # build-node: The node to run build on. - # mvn-settings: Maven settings.xml file containing credentials to use. - # project-name: The job name prefix - # src-dir: The subdirectory of the repository containing subproject code - # stream: The stream to build - # branch: The branch to build - # - # Note: Multiple subprojects can be built with a single JJB project - # by specifying the value of project-name as a list. - # Similarly, multiple streams can be built with a single JJB project - # by specifying the value of the stream as a list. - # For example: - # project-name: - # - subproject-name1: - # src-dir: subproject-dir1 - # docker-name: onap/org.onap.dcaegen2.platform.something.name1 - # - subproject-name2: - # src-dir: subproject-dir2 - # docker-name: onap/org.onap.dcaegen2.platform.something.name2 - # - subproject-name3: - # src-dir: subproject-dir3 - # docker-name: onap/org.onap.dcaegen2.platform.something.name3 - # stream: - # - master: - # branch: master - # - release1: - # branch: release1.0 - # jobs: - # - dcaegen2-docker-python-jobs - - name: '{project-name}-dcaegen2-docker-python-jobs' - id: dcaegen2-docker-python-jobs - container-tag-method: latest - docker-get-container-tag-script: ../../shell/docker-ts-tag-override.sh - nexus-iq-namespace: 'onap-' - tox-dir: '{src-dir}' - docker-root: '{src-dir}' - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: '{src-dir}/.*' - jobs: - - gerrit-tox-verify: - pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh - stream: all - branch: '*' - - gerrit-docker-verify - - gerrit-docker-merge: - post_docker_build_script: | - #!/bin/bash - set -uex -o pipefail - DOCKER_IMAGE_TAG2=${{DOCKER_IMAGE_TAG%-*}} - DNAME={container-snapshot-registry}/{docker-name} - docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:$DOCKER_IMAGE_TAG2 - docker tag $DNAME:$DOCKER_IMAGE_TAG $DNAME:latest - docker push $DNAME:$DOCKER_IMAGE_TAG2 - docker push $DNAME:latest - - - gerrit-maven-clm: - mvn-params: '-f {src-dir}' - stream: master - branch: master - - gerrit-tox-sonar: - # workaround because gerrit-tox-sonar doesn't support mvn-params/opts - sonar-mvn-goal: '-f {src-dir} sonar:sonar' - cron: '@daily' - stream: master - branch: master - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - - -- project: - name: dcaegen2-platform-docker-python-subprojects - project: dcaegen2/platform - mvn-settings: dcaegen2-platform-settings - build-node: ubuntu1804-docker-8c-8g - project-name: - - dcaegen2-platform-adapter-acumos: - src-dir: adapter/acumos - docker-name: onap/org.onap.dcaegen2.platform.adapter.acumos - - dcaegen2-platform-mod-distributorapi: - src-dir: mod/distributorapi - docker-name: onap/org.onap.dcaegen2.platform.mod.distributorapi - - dcaegen2-platform-mod-onboardingapi: - src-dir: mod/onboardingapi - docker-name: onap/org.onap.dcaegen2.platform.mod.onboardingapi - stream: - - master: - branch: master - - kohn: - branch: kohn - - views: - - project-view: - project-name: dcaegen2-platform-adapter - - project-view: - project-name: dcaegen2-platform-mod - jobs: - - dcaegen2-docker-python-jobs diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml deleted file mode 100644 index 0920ead5f..000000000 --- a/jjb/dcaegen2/dcaegen2-platform-mod-designtool.yaml +++ /dev/null @@ -1,50 +0,0 @@ ---- -- project: - name: dcaegen2-platform-mod-designtool - project-name: dcaegen2-platform-mod-designtool - # git repo - project: dcaegen2/platform - jobs: - - gerrit-maven-verify: - pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh - - gerrit-maven-merge - - gerrit-maven-stage: - sign-artifacts: true - sbom-generator: true - sbom-path: 'mod/designtool/' - maven-versions-plugin: true - version-properties-file: 'mod/designtool/version.properties' - mvn-pom: 'mod/designtool/pom.xml' - stream: - - 'master': - branch: 'master' - - 'kohn': - branch: 'kohn' - mvn-settings: dcaegen2-platform-settings - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - gerrit_trigger_file_paths: - - compare-type: ANT - pattern: 'mod/designtool/**' - mvn-goals: 'clean package install' - mvn-params: '-f mod/designtool/pom.xml' - pattern: 'mod/designtool/**' - mvn-snapshot-id: 'ecomp-snapshots' - nexus-snapshot-repo: 'snapshots' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g - - -- project: - name: dcaegen2-platform-mod-designtool-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - project: dcaegen2/platform - build-node: ubuntu1804-docker-8c-8g - project-name: 'dcaegen2-platform-mod-designtool' - stream: - - 'master': - branch: 'master' - mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml deleted file mode 100644 index 4117b810b..000000000 --- a/jjb/dcaegen2/dcaegen2-platform-mod-genprocessor.yaml +++ /dev/null @@ -1,69 +0,0 @@ ---- -- project: - name: dcaegen2-platform-mod-genprocessor - project-name: dcaegen2-platform-mod-genprocessor - # git repo - project: dcaegen2/platform - jobs: - - gerrit-maven-verify: - pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh - - gerrit-maven-merge - - gerrit-maven-stage: - sign-artifacts: true - sbom-generator: true - sbom-path: 'mod/runtimeapi/' - maven-versions-plugin: true - version-properties-file: 'mod/genprocessor/version.properties' - mvn-pom: 'mod/genprocessor/pom.xml' - stream: - - 'master': - branch: 'master' - - 'kohn': - branch: 'kohn' - mvn-settings: dcaegen2-platform-settings - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-goals: 'clean package install' - mvn-params: '-f mod/genprocessor/pom.xml' - gerrit_trigger_file_paths: - - compare-type: ANT - pattern: 'mod/genprocessor/**' - pattern: 'mod/genprocessor/**' - mvn-snapshot-id: 'ecomp-snapshots' - nexus-snapshot-repo: 'snapshots' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g - -- project: - name: dcaegen2-platform-mod-genprocessor-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-docker-8c-8g - project: 'dcaegen2/platform' - project-name: 'dcaegen2-platform-mod-genprocessor' - branch: 'master' - mvn-settings: 'dcaegen2-platform-settings' - mvn-params: '-f mod/genprocessor/pom.xml' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: dcaegen2-platform-mod-genprocessor-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - build-node: ubuntu1804-docker-8c-8g - project: 'dcaegen2/platform' - project-name: dcaegen2-platform-mod-genprocessor-clm - mvn-params: '-f mod/genprocessor/pom.xml' - stream: - - 'master': - branch: 'master' - mvn-settings: 'dcaegen2-platform-settings' - diff --git a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml b/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml deleted file mode 100644 index dd3bd28f1..000000000 --- a/jjb/dcaegen2/dcaegen2-platform-mod-runtimeapi.yaml +++ /dev/null @@ -1,71 +0,0 @@ ---- -- project: - name: dcaegen2-platform-mod-runtimeapi - project-name: dcaegen2-platform-mod-runtimeapi - # git repo - project: dcaegen2/platform - jobs: - - gerrit-maven-verify: - pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh - - gerrit-maven-merge - - gerrit-maven-stage: - sign-artifacts: true - sbom-generator: true - sbom-path: 'mod/runtimeapi/' - maven-versions-plugin: true - version-properties-file: 'mod/runtimeapi/version.properties' - mvn-pom: 'mod/runtimeapi/pom.xml' - stream: - - 'master': - branch: 'master' - - 'kohn': - branch: 'kohn' - java-version: openjdk11 - mvn-settings: dcaegen2-platform-settings - gerrit_trigger_file_paths: - - compare-type: ANT - pattern: 'mod/runtimeapi/**' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-goals: 'clean package install' - mvn-params: '-f mod/runtimeapi/pom.xml' - pattern: 'mod/runtimeapi/**' - mvn-snapshot-id: 'ecomp-snapshots' - nexus-snapshot-repo: 'snapshots' - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g - -- project: - name: dcaegen2-platform-mod-runtimeapi-sonar - java-version: openjdk11 - 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-docker-8c-8g - project: 'dcaegen2/platform' - project-name: 'dcaegen2-platform-mod-runtimeapi' - branch: 'master' - mvn-settings: 'dcaegen2-platform-settings' - mvn-params: '-f mod/runtimeapi/pom.xml' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: dcaegen2-platform-mod-runtimeapi-clm - java-version: openjdk11 - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - build-node: ubuntu1804-docker-8c-8g - project: 'dcaegen2/platform' - project-name: dcaegen2-platform-mod-runtimeapi-clm - mvn-params: '-f mod/runtimeapi/pom.xml' - stream: - - 'master': - branch: 'master' - mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml deleted file mode 100644 index 760d95e89..000000000 --- a/jjb/dcaegen2/dcaegen2-platform-mod2-helm-generator.yaml +++ /dev/null @@ -1,74 +0,0 @@ ---- -- project: - name: dcaegen2-platform-mod2-helm-generator - project-name: dcaegen2-platform-mod2-helm-generator - # git repo - project: dcaegen2/platform - jobs: - - gerrit-maven-verify: - pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh - - gerrit-maven-merge - - gerrit-maven-stage: - sign-artifacts: true - sbom-generator: true - sbom-path: 'mod2/helm-generator/' - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - version-properties-file: 'mod2/helm-generator/version.properties' - mvn-pom: 'mod2/helm-generator/pom.xml' - stream: - - 'master': - branch: 'master' - - 'kohn': - branch: 'kohn' - java-version: openjdk11 - mvn-settings: dcaegen2-platform-settings - gerrit_trigger_file_paths: - - compare-type: ANT - pattern: 'mod2/helm-generator/**' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - mvn-params: '-f mod2/helm-generator/pom.xml' - pattern: 'mod2/helm-generator/**' - mvn-snapshot-id: 'ecomp-snapshots' - nexus-snapshot-repo: 'snapshots' - maven-version: 'mvn35' - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g - -- project: - name: dcaegen2-platform-mod2-helm-generator-sonar - java-version: openjdk11 - 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-docker-8c-8g - project: 'dcaegen2/platform' - project-name: 'dcaegen2-platform-mod2-helm-generator' - branch: 'master' - mvn-settings: 'dcaegen2-platform-settings' - mvn-params: '-f mod2/helm-generator/pom.xml' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: - name: dcaegen2-platform-mod2-helm-generator-clm - java-version: openjdk11 - jobs: - - gerrit-maven-clm - nexus-iq-namespace: 'onap-' - build-node: ubuntu1804-docker-8c-8g - project: 'dcaegen2/platform' - project-name: dcaegen2-platform-mod2-helm-generator - mvn-params: '-f mod2/helm-generator/pom.xml' - stream: - - 'master': - branch: 'master' - mvn-settings: 'dcaegen2-platform-settings' diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index 93adf4d0d..dfe1fe93d 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -48,7 +48,7 @@ project-name: demo jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: demo branch: master diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index e76024eba..e2cc2f2ca 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -81,6 +81,6 @@ project-name: dmaap-buscontroller jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dmaap/buscontroller branch: master diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index 239263a16..d9ecb9826 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -76,6 +76,6 @@ project-name: dmaap-datarouter jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dmaap/datarouter branch: master diff --git a/jjb/dmaap/dmaap-kafka-client.yaml b/jjb/dmaap/dmaap-kafka-client.yaml index 298fb3a1d..e933bccfb 100644 --- a/jjb/dmaap/dmaap-kafka-client.yaml +++ b/jjb/dmaap/dmaap-kafka-client.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true cron: '' - '{project-name}-gerrit-release-jobs': @@ -54,6 +54,6 @@ project-name: dmaap-kafka-client jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dmaap/kafka11aaf branch: master diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index 4dc1ad13f..6f70c585c 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true cron: '' - '{project-name}-gerrit-release-jobs': @@ -56,6 +56,6 @@ project-name: dmaap-messagerouter-dmaapclient jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dmaap/messagerouter/dmaapclient branch: master diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index aaa0b8e2a..30db7f59c 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -80,6 +80,6 @@ project-name: dmaap-messagerouter-messageservice jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: dmaap/messagerouter/messageservice branch: master diff --git a/jjb/doc/rules.yaml b/jjb/doc/rules.yaml new file mode 100644 index 000000000..702449035 --- /dev/null +++ b/jjb/doc/rules.yaml @@ -0,0 +1,136 @@ +- scm: + name: doc-scm + scm: + - git: + url: 'https://gerrit.onap.org/r/{project}' + refspec: '+refs/heads/*:refs/remotes/origin/* +refs/changes/*:refs/changes/*' + branches: + - '{ref}' + +- trigger: + name: doc-rules-patchset-created + triggers: + - gerrit: + trigger-on: + - patchset-created-event + - comment-added-contains-event: + comment-contains-value: recheck + - comment-added-contains-event: + comment-contains-value: reverify + server-name: 'Primary' + projects: + - project-compare-type: 'ANT' + project-pattern: '**' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/*' + - branch-compare-type: 'ANT' + branch-pattern: 'refs/tags/**' + +- builder: + name: doc-rules + builders: + - shell: | + #!/bin/bash + . /lib/lsb/init-functions || exit 0 + exitstatus="0" + warning="0" + log_success_msg "Starting additional checks related to documentation." + log_success_msg "See https://git.onap.org/doc/doc-best-practice for example config files (master branch)." + log_success_msg "Modify example config files if you like to use them in a release branch." + log_success_msg "See https://wiki.onap.org/x/w4IEBw for the detailed procedure #02." + log_success_msg "In case of questions please contact the ONAP documentation team." + if [ ! -d docs ] ; then + log_success_msg "Directory docs not found. Skipping further checks." + exit 0 + fi + for i in docs/index.rst docs/conf.py docs/requirements-docs.txt docs/_static/css/ribbon.css; do + if [ ! -f $i ] ; then + log_failure_msg "$i missing. Please add it or remove the full docs directory." + exitstatus="1" + else + log_success_msg "$i found." + fi + done + for i in docs/conf.yaml; do + if [ -f $i ] ; then + log_failure_msg "$i found. It is no longer required. Please remove it." + exitstatus="1" + else + log_success_msg "$i not found." + fi + done + filename="docs/tox.ini" + if [ ! -f $filename ] ; then + log_failure_msg "$filename missing. Please add it or remove the full docs directory." + exitstatus="1" + else + log_success_msg "$filename found." + sphinxbuild_detected=0 + linenumber=0 + while IFS="" read -r line || [ -n "$line" ] ; do + linenumber=$((linenumber+1)) + if echo $line | grep -q '^[ \t]*sphinx-build.*' ; then + sphinxbuild_detected="1" + if echo $line | grep -q '^[ \t]*sphinx-build.* -W ' ; then + log_success_msg "sphinx-build option '-W' used in $filename, line $linenumber." + elif echo $line | grep -q ' \-b spelling ' ; then + log_warning_msg "sphinx-build option '-W' not used for spellcheck in $filename, line $linenumber." + warning="1" + else + log_failure_msg "sphinx-build option '-W' missing in $filename, line $linenumber. Please add it." + exitstatus="1" + fi + fi + done < $filename + if [ "$sphinxbuild_detected" = "0" ]; then + log_failure_msg "Sphinx-build command(s) missing in $filename. Please add it." + exitstatus="1" + fi + unset sphinxbuild_detected + unset linenumber + fi + unset filename + filename="docs/_static/css/ribbon.css" + if [ ! -f $filename ]; then + log_failure_msg "$filename missing. Please add it or remove the full docs directory." + exitstatus="1" + else + log_success_msg "$filename found." + cssmaxwidth=$(grep '^[ \t]*max-width:' $filename | sed -e 's/^[ \t]*//' | sed -e 's/;$//'); + if [[ ! $cssmaxwidth == *"max-width: 800px"* ]]; then + log_failure_msg "Setting 'max-width: 800px' missing in $filename. Please add it." + exitstatus="1" + else + log_success_msg "Setting 'max-width: 800px' found in $filename." + fi + unset cssmaxwidth + fi + unset filename + if [ "$exitstatus" = "0" ]; then + if [ "$warning" = "0" ]; then + log_success_msg "Congratulations! No documentation problem(s) detected." + else + log_warning_msg "No major documentation problem(s) detected but there are warnings!" + fi + else + log_failure_msg "Please fix the detected documentation problem(s)!" + fi + exit $exitstatus + +- job-template: + name: doc-rules + node: ubuntu1804-docker-8c-8g + triggers: + - doc-rules-patchset-created + scm: + - doc-scm: + ref: $GERRIT_REFSPEC + project: $GERRIT_PROJECT + builders: + - doc-rules + +- project: + name: 'doc-rules' + jobs: + - 'doc-rules' diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index 35ef4a2cc..5821aab1c 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -88,6 +88,6 @@ project-name: externalapi-nbi jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: externalapi/nbi branch: master diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index dada9edc1..cb43d2558 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true java-version: openjdk11 sbom-generator: true @@ -64,6 +64,6 @@ project-name: holmes-common jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: holmes/common branch: master diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index 6e5682bdf..b9a1d95c1 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true java-version: openjdk11 sbom-generator: true @@ -64,6 +64,6 @@ project-name: holmes-engine-management jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: holmes/engine-management branch: master diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index 385721e59..1357f6935 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true java-version: openjdk11 sbom-generator: true @@ -64,6 +64,6 @@ project-name: holmes-rule-management jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: holmes/rule-management branch: master diff --git a/jjb/integration/docker/integration-docker-onap-java11.yaml b/jjb/integration/docker/integration-docker-onap-java11.yaml index 4ad47ab95..f290699a5 100644 --- a/jjb/integration/docker/integration-docker-onap-java11.yaml +++ b/jjb/integration/docker/integration-docker-onap-java11.yaml @@ -1,17 +1,17 @@ --- - 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 + build-node: centos8-builder-2c-1g project: integration/docker/onap-java11 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/include-raw-integration-install-robotframework-py3.sh b/jjb/integration/include-raw-integration-install-robotframework-py3.sh index 6d0b4968e..efeb0f78b 100644 --- a/jjb/integration/include-raw-integration-install-robotframework-py3.sh +++ b/jjb/integration/include-raw-integration-install-robotframework-py3.sh @@ -10,24 +10,70 @@ ############################################################################## # vim: sw=4 ts=4 sts=4 et ft=sh : -set -eu pipefail +set -euxo pipefail -# shellcheck disable=SC1090 -. ~/lf-env.sh +echo "---> install-robotframework-py3.sh" -# Create a virtual environment for robot tests and make sure setuptools & wheel -# are up-to-date in addition to pip -lf-activate-venv --python python3 --venv-file "${WORKSPACE}/.robot3_venv" \ - setuptools \ - wheel +### Common variables + +REQUIRED_PYTHON="3.7.0" + +### Common functions + +# Allows for the comparison of two Python version strings +ver_cmp() +{ + local IFS=. + # shellcheck disable=SC2206 + local V1=($1) V2=($2) I + for ((I=0 ; I<${#V1[*]} || I<${#V2[*]} ; I++)) ; do + [[ ${V1[$I]:-0} -lt ${V2[$I]:-0} ]] && echo -1 && return + [[ ${V1[$I]:-0} -gt ${V2[$I]:-0} ]] && echo 1 && return + done + echo 0 +} +# Checks if first version/string is greater than or equal to the second +ver_ge() +{ + [[ ! $(ver_cmp "$1" "$2") -eq -1 ]] +} -# Save the virtual environment in ROBOT_VENV -ROBOT3_VENV="$(cat "${WORKSPACE}/.robot3_venv")" -echo ROBOT3_VENV="${ROBOT3_VENV}" >> "${WORKSPACE}/env.properties" +### Main script entry point -set -exu +# Check for required Python versions and activate/warn appropriately +# Use PYENV for selecting the latest python version, if available +if [[ -d "/opt/pyenv" ]]; then + echo "Setup pyenv:" + export PYENV_ROOT="/opt/pyenv" + export PATH="$PYENV_ROOT/bin:$PATH" + pyenv versions + if command -v pyenv 1>/dev/null 2>&1; then + eval "$(pyenv init - --no-rehash)" + # Choose the latest numeric Python version from installed list + version=$(pyenv versions --bare | sed '/^[^0-9]/d' |\ + sort -V | tail -n 1) + pyenv local "${version}" + fi +fi -echo "Installing Python Requirements" +# Store the active/current Python3 version +PYTHON_VERSION=$(python3 --version | awk '{print $2}') + +# Check that the required minimum version has been met +if ! (ver_ge "${PYTHON_VERSION}" "${REQUIRED_PYTHON}"); then + echo "Warning: possible Python version problem" + echo "Python ${PYTHON_VERSION} does not meet requirement: ${REQUIRED_PYTHON}" +fi + +if (python3 -m robot.run --version > /dev/null 2>&1); then + echo "Working robot framework found; no installation necessary" + echo "Installed under Python version: ${PYTHON_VERSION}" + exit 0 +fi + + +# Create a requirements file; keep it around for potential later use +# Versions and dependencies below have been carefully tested for Python3 cat << 'EOF' > "requirements.txt" paramiko six @@ -79,6 +125,49 @@ PyVirtualDisplay odltools EOF -python3 -m pip install -r requirements.txt + +if [[ -f ~/lf-env.sh ]]; then + echo "Installing robot-framework using LF common tooling" + # shellcheck disable=SC1090 + source ~/lf-env.sh + + # Create a virtual environment for robot tests and make sure setuptools & wheel + # are up-to-date in addition to pip + lf-activate-venv --python python3 --venv-file "${WORKSPACE}/.robot3_venv" \ + setuptools \ + pip \ + wheel + + # Install the robot framework and other dependencies + python3 -m pip install -r requirements.txt + + # Save the virtual environment in ROBOT3_VENV + ROBOT3_VENV="$(cat "${WORKSPACE}/.robot3_venv")" + +else + echo "Installing robot-framework in a virtual environment" + if [[ -z "${WORKSPACE}" ]]; then + # Use a temporary folder location + WORKSPACE="/tmp" + ROBOT3_VENV=$(mktemp -d --suffix=-robot3_venv) + else + ROBOT3_VENV="${WORKSPACE}/.robot3_venv" + fi + + # The --system-site-packages parameter allows us to pick up system level + # installed packages. This allows us to bake matplotlib which takes very long + # to install into the image. + python3 -m venv --system-site-packages "${ROBOT3_VENV}" + source "${ROBOT3_VENV}/bin/activate" + + echo "Installing robot-framework using basic methods" + python3 -m pip install -r requirements.txt +fi + +# Store the virtual environment location +echo "ROBOT3_VENV=${ROBOT3_VENV}" >> "${WORKSPACE}/env.properties" + +# Display versioning/debugging output +python3 --version python3 -m pip freeze python3 -m robot.run --version || : diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index 7d831c673..920d5edae 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -48,13 +48,22 @@ - builder: name: integration-run-test builders: - - shell: "${WORKSPACE}/run-csit.sh ${TESTPLAN} ${TESTOPTIONS}" + - shell: | + git clone https://gerrit.onap.org/r/ci-management /tmp/ci-management + cp /tmp/ci-management/jjb/integration/*csit.sh ${WORKSPACE} + ${WORKSPACE}/run-csit.sh ${TESTPLAN} ${TESTOPTIONS} - builder: name: integration-run-project-test builders: - shell: "${WORKSPACE}/csit/run-project-csit.sh ${TESTOPTIONS}" + +- builder: + name: integration-run-project-k8s-test + builders: + - shell: "${WORKSPACE}/csit/run-k8s-csit.sh install ${TESTOPTIONS}" + - builder: name: integration-autorelease-fix-relativepaths builders: diff --git a/jjb/integration/integration-python-onapsdk.yaml b/jjb/integration/integration-python-onapsdk.yaml index e780058d5..0c7e6b4ee 100644 --- a/jjb/integration/integration-python-onapsdk.yaml +++ b/jjb/integration/integration-python-onapsdk.yaml @@ -22,14 +22,15 @@ tox-dir: '.' tox-envs: 'py39' pattern: '**/*.py' - - 'python3.10': - tox-dir: '.' - tox-envs: 'py310' - pattern: '**/*.py' - - 'python3.11': - tox-dir: '.' - tox-envs: 'py311' - pattern: '**/*.py' + # Disable due to https://jira.linuxfoundation.org/plugins/servlet/desk/portal/2/IT-25247 + # - 'python3.10': + # tox-dir: '.' + # tox-envs: 'py310' + # pattern: '**/*.py' + # - 'python3.11': + # tox-dir: '.' + # tox-envs: 'py311' + # pattern: '**/*.py' - 'pylint': tox-dir: '.' tox-envs: 'pylint' diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 77be42b97..34e3ed6cc 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/integration/prepare-csit.sh b/jjb/integration/prepare-csit.sh index 1052bff86..dc732c6bb 100644 --- a/jjb/integration/prepare-csit.sh +++ b/jjb/integration/prepare-csit.sh @@ -24,18 +24,48 @@ set -exo pipefail ROBOT_INSTALLER='include-raw-integration-install-robotframework-py3.sh' -if !(which git > /dev/null 2>&1); then - echo "GIT binary not found current PATH" - echo $PATH; exit 1 +# Allows testing for root permissions +REQ_USER=$(id -un) + +if ! (which git > /dev/null 2>&1); then + echo "GIT binary not found in current PATH" + # Add missing package to prevent script/job failures + if (grep Ubuntu /etc/os-release > /dev/null 2>&1) || \ + (grep Debian /etc/os-release > /dev/null 2>&1); then + echo "Installing package dependency for Ubuntu/Debian" + if [[ "${REQ_USER}" == 'root' ]]; then + apt-get update + apt-get install -y git + else + sudo apt-get update + sudo apt-get install -y git + fi + elif (grep RedHat /etc/os-release > /dev/null 2>&1) || \ + (grep CentOS /etc/os-release > /dev/null 2>&1); then + echo "Installing package dependency for CentOS/RedHat" + if [[ "${REQ_USER}" == 'root' ]]; then + yum install -y git + else + sudo yum install -y git + fi + else + echo "Warning: unmatched OS/distribution" + echo "Missing software will not be installed" + fi fi -if [ -z "$WORKSPACE" ]; then - # shellcheck disable=SC2155 - export WORKSPACE=`git rev-parse --show-toplevel` +if [[ -z "${WORKSPACE}" ]]; then + if (git rev-parse --show-toplevel > /dev/null 2>&1); then + WORKSPACE=$(git rev-parse --show-toplevel) + export WORKSPACE + else + WORKSPACE=$(pwd) + export WORKSPACE + fi fi # shellcheck disable=SC2034 -TESTPLANDIR=${WORKSPACE}/${TESTPLAN} +TESTPLANDIR="${WORKSPACE}/${TESTPLAN}" # Python version should match that used to setup # robot-framework in other jobs/stages @@ -56,22 +86,30 @@ fi # Assume that if ROBOT3_VENV is set, virtualenv # with system site packages can be activated -if [ -f ${WORKSPACE}/env.properties ]; then - source ${WORKSPACE}/env.properties +if [[ -f "${WORKSPACE}/env.properties" ]]; then + source "${WORKSPACE}/env.properties" +elif [[ -f /tmp/env.properties ]]; then + source /tmp/env.properties fi -if [ -f ${ROBOT3_VENV}/bin/activate ]; then - source ${ROBOT3_VENV}/bin/activate + +if [[ -f "${ROBOT3_VENV}/bin/activate" ]]; then + source "${ROBOT3_VENV}/bin/activate" else # Robot framework was not found - # clone ci-management repository and use install script - git clone "https://gerrit.onap.org/r/ci-management" \ + # Clone/update ci-management repository and invoke install script + if [[ ! -d /tmp/ci-management ]]; then + git clone "https://gerrit.onap.org/r/ci-management" \ /tmp/ci-management - source /tmp/ci-management/jjb/integration/${ROBOT_INSTALLER} + else + git pull /tmp/ci-management + fi + # shellcheck disable=SC1090 + source "/tmp/ci-management/jjb/integration/${ROBOT_INSTALLER}" fi # install eteutils -mkdir -p ${ROBOT3_VENV}/src/onap -rm -rf ${ROBOT3_VENV}/src/onap/testsuite +mkdir -p "${ROBOT3_VENV}/src/onap" +rm -rf "${ROBOT3_VENV}/src/onap/testsuite" # Source from the Nexus repository python3 -m pip install --upgrade \ --extra-index-url="https://nexus3.onap.org/repository/PyPi.staging/simple" \ diff --git a/jjb/integration/run-csit.sh b/jjb/integration/run-csit.sh index bd35ac438..4ee5d753b 100644 --- a/jjb/integration/run-csit.sh +++ b/jjb/integration/run-csit.sh @@ -15,42 +15,15 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# $1 project/functionality -# $2 robot options +# $1 project/functionality {TESTPLAN} +# $2 robot options {TESTOPTIONS} echo "---> run-csit.sh" -WORKDIR=$(mktemp -d --suffix=-robot-workdir) - -# Python version should match that used to setup -# robot-framework in other jobs/stages -# Use pyenv for selecting the python version -if [[ -d "/opt/pyenv" ]]; then - echo "Setup pyenv:" - export PYENV_ROOT="/opt/pyenv" - export PATH="$PYENV_ROOT/bin:$PATH" - pyenv versions - if command -v pyenv 1>/dev/null 2>&1; then - eval "$(pyenv init - --no-rehash)" - # Choose the latest numeric Python version from installed list - version=$(pyenv versions --bare \ - | sed '/^[^0-9]/d' | sort -V | tail -n 1) - pyenv local "${version}" - fi -fi - # # functions # -# wrapper for sourcing a file -function source_safely { - [ -z "$1" ] && return 1 - relax_set - . "$1" - load_set -} - function on_exit { rc=$? if [[ ${WORKSPACE} ]]; then @@ -134,6 +107,14 @@ function relax_set { set +o pipefail } +# wrapper for sourcing a file +function source_safely { + [ -z "$1" ] && return 1 + relax_set + . "$1" + load_set +} + # # main # @@ -175,10 +156,11 @@ source_safely "${WORKSPACE}/prepare-csit.sh" # Activate the virtualenv containing all the required libraries installed by prepare-csit.sh source_safely "${ROBOT3_VENV}/bin/activate" +WORKDIR=$(mktemp -d --suffix=-robot-workdir) cd "${WORKDIR}" # Add csit scripts to PATH -export PATH="${PATH}:${WORKSPACE}/docker/scripts:${WORKSPACE}/scripts:${ROBOT_VENV}/bin" +export PATH="${PATH}:${WORKSPACE}/docker/scripts:${WORKSPACE}/scripts:${ROBOT3_VENV}/bin" export SCRIPTS="${WORKSPACE}/scripts" export ROBOT_VARIABLES= @@ -199,23 +181,23 @@ docker_stats | tee "$WORKSPACE/archives/$TESTPLAN/_sysinfo-1-after-setup.txt" # Run test plan cd "$WORKDIR" echo "Reading the testplan:" -cat "${TESTPLANDIR}/testplan.txt" | egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' | sed "s|^|${WORKSPACE}/tests/|" > testplan.txt +grep -E -v '(^[[:space:]]*#|^[[:space:]]*$)' "${TESTPLANDIR}/testplan.txt" |\ + sed "s|^|${WORKSPACE}/tests/|" > testplan.txt cat testplan.txt SUITES=$( xargs -a testplan.txt ) -echo ROBOT_VARIABLES="${ROBOT_VARIABLES}" -echo "Starting Robot test suites ${SUITES} ..." -relax_set - echo "Versioning information:" python3 --version -pip freeze +pip3 freeze python3 -m robot.run --version || : -python -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES} +echo ROBOT_VARIABLES="${ROBOT_VARIABLES}" +echo "Starting Robot test suites ${SUITES} ..." +relax_set +# Do NOT quote variables below, it breaks testing +python3 -m robot.run -N ${TESTPLAN} -v WORKSPACE:/tmp ${ROBOT_VARIABLES} ${TESTOPTIONS} ${SUITES} RESULT=$? load_set echo "RESULT: $RESULT" # Note that the final steps are done in on_exit function after this exit! exit $RESULT - diff --git a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml index 84c8b7240..7723a66d7 100644 --- a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml +++ b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml @@ -28,7 +28,7 @@ - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' @@ -36,6 +36,6 @@ mvn-params: '-P docker' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-goals: 'clean deploy' diff --git a/jjb/integration/simulators/integration-onap-components-simulators.yaml b/jjb/integration/simulators/integration-onap-components-simulators.yaml new file mode 100644 index 000000000..7c1f81807 --- /dev/null +++ b/jjb/integration/simulators/integration-onap-components-simulators.yaml @@ -0,0 +1,85 @@ +- project: + name: 'integration-onap-components-simulators-docker' + jobs: + - gerrit-docker-verify: + project-name: 'integration-onap-component-simulators-aai' + docker-root: ./mock-aai + docker-name: 'onap/onap-component-mock-aai' + - gerrit-docker-merge: + project-name: 'integration-onap-component-simulators-aai' + docker-root: ./mock-aai + docker-name: 'onap/onap-component-mock-aai' + - gerrit-docker-verify: + project-name: 'integration-onap-component-simulators-cds' + docker-root: ./mock-cds + docker-name: 'onap/onap-component-mock-cds' + - gerrit-docker-merge: + project-name: 'integration-onap-component-simulators-cds' + docker-root: ./mock-cds + docker-name: 'onap/onap-component-mock-cds' + - gerrit-docker-verify: + project-name: 'integration-onap-component-simulators-clamp' + docker-root: ./mock-clamp + docker-name: 'onap/onap-component-mock-clamp' + - gerrit-docker-merge: + project-name: 'integration-onap-component-simulators-clamp' + docker-root: ./mock-clamp + docker-name: 'onap/onap-component-mock-clamp' + - gerrit-docker-verify: + project-name: 'integration-onap-component-simulators-dmaap' + docker-root: ./mock-dmaap + docker-name: 'onap/onap-component-mock-dmaap' + - gerrit-docker-merge: + project-name: 'integration-onap-component-simulators-dmaap' + docker-root: ./mock-dmaap + docker-name: 'onap/onap-component-mock-dmaap' + - gerrit-docker-verify: + project-name: 'integration-onap-component-simulators-msb-k8s' + docker-root: ./mock-msb-k8s + docker-name: 'onap/onap-component-mock-k8s' + - gerrit-docker-merge: + project-name: 'integration-onap-component-simulators-msb-k8s' + docker-root: ./mock-msb-k8s + docker-name: 'onap/onap-component-mock-k8s' + - gerrit-docker-verify: + project-name: 'integration-onap-component-simulators-sdc' + docker-root: ./mock-sdc + docker-name: 'onap/onap-component-mock-sdc' + - gerrit-docker-merge: + project-name: 'integration-onap-component-simulators-sdc' + docker-root: ./mock-sdc + docker-name: 'onap/onap-component-mock-sdc' + - gerrit-docker-verify: + project-name: 'integration-onap-component-simulators-sdnc' + docker-root: ./mock-sdnc + docker-name: 'onap/onap-component-mock-sdnc' + - gerrit-docker-merge: + project-name: 'integration-onap-component-simulators-sdnc' + docker-root: ./mock-sdnc + docker-name: 'onap/onap-component-mock-sdnc' + - gerrit-docker-verify: + project-name: 'integration-onap-component-simulators-so' + docker-root: ./mock-so + docker-name: 'onap/onap-component-mock-so' + - gerrit-docker-merge: + project-name: 'integration-onap-component-simulators-so' + docker-root: ./mock-so + docker-name: 'onap/onap-component-mock-so' + - gerrit-docker-verify: + project-name: 'integration-onap-component-simulators-ves' + docker-root: ./mock-ves + docker-name: 'onap/onap-component-mock-ves' + - gerrit-docker-merge: + project-name: 'integration-onap-component-simulators-ves' + docker-root: ./mock-ves + docker-name: 'onap/onap-component-mock-ves' + project: 'integration/onap-component-simulators' + stream: + - 'master': + branch: 'master' + files: '' + docker-root: '$WORKSPACE' + mvn-settings: 'integration-settings' + build-node: ubuntu1804-docker-8c-8g + cron: '@daily' + container-tag-method: stream
\ No newline at end of file diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml index b73e5f21f..4d6fe876a 100644 --- a/jjb/integration/simulators/integration-pnf-simulator.yaml +++ b/jjb/integration/simulators/integration-pnf-simulator.yaml @@ -22,7 +22,7 @@ build-node: centos7-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-goals: 'clean deploy' - gerrit-maven-docker-stage: diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml index 2c8584c26..ff8faf24e 100644 --- a/jjb/integration/simulators/integration-ran-simulator.yaml +++ b/jjb/integration/simulators/integration-ran-simulator.yaml @@ -23,7 +23,7 @@ build-node: centos7-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-goals: 'clean deploy' diff --git a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml index 4b396e80e..bad080116 100644 --- a/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml +++ b/jjb/integration/simulators/nf-simulator/integration-pm-https-server-nf-simulator.yaml @@ -8,7 +8,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml index 5a1c2e97a..8cb50d6db 100644 --- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml +++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-avcn-manager.yaml @@ -8,7 +8,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml index 282ca4574..cca5dab8c 100644 --- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml +++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-netconf-server.yaml @@ -9,7 +9,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml index e26074597..ba4c331a2 100644 --- a/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml +++ b/jjb/integration/simulators/nf-simulator/integration-simulators-nf-simulator-simulator-cli.yaml @@ -35,7 +35,7 @@ name: integration-simulators-nf-simulator-info jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: 'integration/simulators/nf-simulator' project-name: 'integration-simulators-nf-simulator' branch: 'master' diff --git a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml index a36665bcc..8c83a9cea 100644 --- a/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml +++ b/jjb/integration/simulators/nf-simulator/integration-ves-client-nf-simulator.yaml @@ -8,7 +8,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g @@ -60,6 +60,6 @@ name: integration-simulators-nf-simulator-ves-client-info project: integration/simulators/nf-simulator/ves-client project-name: integration-simulators-nf-simulator-ves-client - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml index f61a8783c..bab397e6b 100644 --- a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml +++ b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement-r-apps.yaml @@ -3,7 +3,7 @@ name: integration-usecases-A1-policy-enforcement-r-apps-info project: integration/usecases/A1-policy-enforcement-r-apps project-name: integration-usecases-A1-policy-enforcement-r-apps - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml index 13659e68d..d7f43cdff 100644 --- a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml +++ b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml @@ -4,7 +4,7 @@ name: integration-usecases-A1-policy-enforcement-info project: integration/usecases/A1-policy-enforcement project-name: integration-usecases-A1-policy-enforcement - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml index 67be689c4..8d9e0587f 100644 --- a/jjb/integration/xtesting/integration-xtesting.yaml +++ b/jjb/integration/xtesting/integration-xtesting.yaml @@ -4,7 +4,7 @@ project-name: integration-xtesting jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: integration/xtesting branch: master diff --git a/jjb/lf-infra-sandbox-3.yaml b/jjb/lf-infra-sandbox-3.yaml index 6f496d5bb..4bd142b73 100644 --- a/jjb/lf-infra-sandbox-3.yaml +++ b/jjb/lf-infra-sandbox-3.yaml @@ -4,6 +4,6 @@ project-name: sandbox-3 jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: sandbox-3 branch: master diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml index 3ca61db2e..2c29f1b37 100644 --- a/jjb/modeling/modeling-etsicatalog.yaml +++ b/jjb/modeling/modeling-etsicatalog.yaml @@ -18,7 +18,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true sbom-generator: true @@ -67,6 +67,6 @@ project-name: modeling-etsicatalog jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: modeling/etsicatalog branch: master diff --git a/jjb/modeling/modeling-modelspec.yaml b/jjb/modeling/modeling-modelspec.yaml index 1cae6b721..8a0b3d69c 100644 --- a/jjb/modeling/modeling-modelspec.yaml +++ b/jjb/modeling/modeling-modelspec.yaml @@ -4,6 +4,6 @@ project-name: modeling-modelspec jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: modeling/modelspec branch: master diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index 0eb834a5c..c7b6db3b0 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g @@ -84,6 +84,6 @@ project-name: msb-apigateway jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: msb/apigateway branch: master diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index 3764b2cfb..e1de86867 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g @@ -77,6 +77,6 @@ project-name: msb-discovery jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: msb/discovery branch: master diff --git a/jjb/msb/msb-java-sdk.yaml b/jjb/msb/msb-java-sdk.yaml index 15aa9a04f..dd7bc75d4 100644 --- a/jjb/msb/msb-java-sdk.yaml +++ b/jjb/msb/msb-java-sdk.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true project: 'msb/java-sdk' stream: @@ -50,6 +50,6 @@ project-name: msb-java-sdk jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: msb/java-sdk branch: master diff --git a/jjb/msb/msb-swagger-sdk.yaml b/jjb/msb/msb-swagger-sdk.yaml index fbd5009cd..f4815e910 100644 --- a/jjb/msb/msb-swagger-sdk.yaml +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true project: 'msb/swagger-sdk' stream: @@ -50,6 +50,6 @@ project-name: msb-swagger-sdk jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: msb/swagger-sdk branch: master diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 56f8da137..8ef2bcbe1 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -18,7 +18,7 @@ jobs: - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/multicloud/multicloud-framework.yaml b/jjb/multicloud/multicloud-framework.yaml index cec2f6730..ffb58ae89 100644 --- a/jjb/multicloud/multicloud-framework.yaml +++ b/jjb/multicloud/multicloud-framework.yaml @@ -3,6 +3,6 @@ project-name: multicloud-framework jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: multicloud/framework branch: master diff --git a/jjb/multicloud/multicloud-info.yaml b/jjb/multicloud/multicloud-info.yaml index c1aa85e86..9519ea6e2 100644 --- a/jjb/multicloud/multicloud-info.yaml +++ b/jjb/multicloud/multicloud-info.yaml @@ -5,7 +5,7 @@ project-name: multicloud jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: multicloud branch: master @@ -14,7 +14,7 @@ project-name: multicloud-windriver jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: multicloud/openstack/windriver branch: master @@ -23,7 +23,7 @@ project-name: multicloud-oom jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: multicloud/oom branch: master @@ -32,6 +32,6 @@ project-name: multicloud-k8s jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: multicloud/k8s branch: master diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index 6b05bec8b..1b59ff8cc 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -14,7 +14,7 @@ jobs: - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g @@ -93,7 +93,7 @@ project-name: multicloud-openstack-vmware jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: multicloud/openstack/vmware branch: master disabled: true diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index e13705c49..4d83ed268 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -60,10 +60,10 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-goals: install mvn-params: '-P docker' maven-versions-plugin: true @@ -73,7 +73,7 @@ build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' - build-node: 'centos7-builder-4c-4g' + build-node: 'centos8-builder-4c-4g' #- project: # name: multicloud-openstack-arm64 @@ -220,6 +220,6 @@ project-name: multicloud-openstack jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: multicloud/openstack branch: master diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml index 0985d66c2..adf8b3a2c 100644 --- a/jjb/music/music-distributed-kv-store.yaml +++ b/jjb/music/music-distributed-kv-store.yaml @@ -24,6 +24,6 @@ project-name: music-distributed-kv-store jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: music/distributed-kv-store branch: master diff --git a/jjb/music/music-jar.yaml b/jjb/music/music-jar.yaml index 5d260ca68..c899e0afa 100644 --- a/jjb/music/music-jar.yaml +++ b/jjb/music/music-jar.yaml @@ -12,7 +12,7 @@ - gerrit-maven-stage: sbom-generator: true sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-version-plugin: true mvn-pom: 'jar/pom.xml' mvn-params: '-f jar/pom.xml' diff --git a/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml b/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml index f6940517b..7a5f037d9 100644 --- a/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml +++ b/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml @@ -9,6 +9,6 @@ name: oom-platform-cert-manager-info project: oom/platform/cert-manager project-name: oom-platform-cert-manager - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml index a2f54f3cb..9a09775b2 100644 --- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml @@ -9,7 +9,7 @@ name: oom-platform-cert-service-info project: oom/platform/cert-service project-name: oom-platform-cert-service - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -38,11 +38,13 @@ - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true mvn-goals: 'clean deploy -P docker' - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' diff --git a/jjb/oom-utils/oom-utils.yaml b/jjb/oom-utils/oom-utils.yaml index 477d66ee3..fe55f1558 100644 --- a/jjb/oom-utils/oom-utils.yaml +++ b/jjb/oom-utils/oom-utils.yaml @@ -9,6 +9,6 @@ name: oom-utils-info project: oom/utils project-name: oom-utils - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml index be478671f..3ce7466f5 100644 --- a/jjb/oom/offline-installer.yaml +++ b/jjb/oom/offline-installer.yaml @@ -20,7 +20,7 @@ project-name: offline-installer jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: oom/offline-installer branch: master diff --git a/jjb/oom/oom-consul.yaml b/jjb/oom/oom-consul.yaml index 4b7ec3063..caff95b2e 100644 --- a/jjb/oom/oom-consul.yaml +++ b/jjb/oom/oom-consul.yaml @@ -9,7 +9,7 @@ name: oom-consul-info project: oom/consul project-name: oom-consul - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/oom/oom-oneclick-config.yaml b/jjb/oom/oom-oneclick-config.yaml index 8defb44ab..52cdd85de 100644 --- a/jjb/oom/oom-oneclick-config.yaml +++ b/jjb/oom/oom-oneclick-config.yaml @@ -53,6 +53,6 @@ project-name: oomconfig jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: oom branch: master diff --git a/jjb/oom/oom-readiness.yaml b/jjb/oom/oom-readiness.yaml index de9308990..d88533e7d 100644 --- a/jjb/oom/oom-readiness.yaml +++ b/jjb/oom/oom-readiness.yaml @@ -4,7 +4,7 @@ project-name: oom-readiness jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: oom/readiness branch: master diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index 93fabe716..adb5158df 100644 --- a/jjb/oom/oom-registrator.yaml +++ b/jjb/oom/oom-registrator.yaml @@ -6,11 +6,13 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-release-version-java-daily' - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-pom: 'pom.xml' @@ -43,6 +45,6 @@ project-name: oom-registrator jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: oom/registrator branch: master diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index 513b73c4d..c4434f736 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -45,6 +45,6 @@ project-name: oparent jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: oparent branch: master diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index a342bcdd9..7aef56947 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -20,12 +20,14 @@ - '{project-name}-{stream}-{subproject}-merge-java': build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' @@ -72,6 +74,6 @@ project-name: optf-has jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: optf/has branch: master diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index 64d7db498..46e719f12 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -21,12 +21,14 @@ - '{project-name}-{stream}-{subproject}-merge-java': build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: + sbom-generator: true sign-artifacts: true - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' @@ -73,6 +75,6 @@ project-name: optf-osdf jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: optf/osdf branch: master diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 290e674f5..af713bd0e 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -16,7 +16,7 @@ mvn-params: "-P docker" - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -82,6 +82,6 @@ project-name: policy-apex-pdp jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/apex-pdp branch: master diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index fc2287d92..85e765b62 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -10,7 +10,7 @@ build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -76,6 +76,6 @@ project-name: policy-api jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/api branch: master diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml index ad5641faa..5baaf02a9 100644 --- a/jjb/policy/policy-clamp.yaml +++ b/jjb/policy/policy-clamp.yaml @@ -4,7 +4,7 @@ project-name: 'policy-clamp' jobs: - gerrit-maven-stage: - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' @@ -78,6 +78,6 @@ project-name: policy-clamp jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/clamp branch: master diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index bb9b1d4cc..b488b1fc5 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - '{project-name}-gerrit-release-jobs': @@ -67,6 +67,6 @@ project-name: policy-common jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/common branch: master diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml index a7ae387b1..ee37054d4 100644 --- a/jjb/policy/policy-csit-jobs.yaml +++ b/jjb/policy/policy-csit-jobs.yaml @@ -112,3 +112,119 @@ recipients: '{recipients}' notify-every-unstable-build: false send-to-individuals: true + +- job-template: + name: '{project-name}-{stream}-project-k8s-csit-{functionality}' + disabled: '{disabled}' + project-type: freestyle + build-node: 'ubuntu1804-docker-8c-8g' + node: '{build-node}' + recipients: '' + java-version: 'openjdk11' + python-version: python3 + + properties: + - lf-infra-properties: + project: '{project}' + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - integration-test-options: + test-options: '{functionality}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'default' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - timed: '@daily' + - reverse: + jobs: '{obj:trigger_jobs}' + + builders: + - lf-infra-pre-build + - lf-update-java-alternatives: + java-version: '{java-version}' + - integration-run-project-k8s-test + + publishers: + - integration-project-robot: + unstable-if: 0.0 + pass-if: 100.0 + - lf-infra-publish + - email: + recipients: '{recipients}' + notify-every-unstable-build: false + send-to-individuals: true + + +- job-template: + name: '{project-name}-{stream}-project-k8s-csit-verify-{functionality}' + disabled: '{disabled}' + + project-type: freestyle + build-node: 'ubuntu1804-docker-8c-8g' + node: '{build-node}' + recipients: '' + java-version: 'openjdk11' + python-version: python3 + + properties: + - lf-infra-properties: + project: '{project}' + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - integration-test-options: + test-options: '{functionality}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + triggers: + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '**/csit/**' + + builders: + - lf-infra-pre-build + - lf-update-java-alternatives: + java-version: '{java-version}' + - integration-run-project-k8s-test + + publishers: + - integration-project-robot: + unstable-if: 0.0 + pass-if: 100.0 + - lf-infra-publish + - email: + recipients: '{recipients}' + notify-every-unstable-build: false + send-to-individuals: true diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index fdb74e93d..4a0736d65 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -179,7 +179,7 @@ - '{project-name}-{stream}-project-csit-verify-{functionality}' - '{project-name}-{stream}-project-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-distribution.yaml b/jjb/policy/policy-distribution.yaml index 3a6d3b9a3..ef6f3fc6c 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -10,7 +10,7 @@ build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -76,6 +76,6 @@ project-name: policy-distribution jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/distribution branch: master diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index 5626e58ab..e37c0e962 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -59,6 +59,6 @@ project-name: policy-docker jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/docker branch: master diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index dfad61bea..7a499548c 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -10,7 +10,7 @@ mvn-params: "-P docker -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false" - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -86,6 +86,6 @@ project-name: policy-drools-applications jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/drools-applications branch: master diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 4b630c959..76ee7afd4 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -10,7 +10,7 @@ mvn-params: "-P docker" - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -77,6 +77,6 @@ project-name: policy-drools-pdp jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/drools-pdp branch: master diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml index 2c50abba2..f6843f624 100644 --- a/jjb/policy/policy-gui.yaml +++ b/jjb/policy/policy-gui.yaml @@ -10,7 +10,7 @@ build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -75,6 +75,6 @@ project-name: policy-gui jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/gui branch: master diff --git a/jjb/policy/policy-k8s-csit.yaml b/jjb/policy/policy-k8s-csit.yaml new file mode 100644 index 000000000..e02b6c242 --- /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/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index e3cbf3af5..9831f1413 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -10,7 +10,7 @@ build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -76,6 +76,6 @@ project-name: policy-models jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/models branch: master diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index 257f6efdf..092b6ab96 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -10,7 +10,7 @@ build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -76,6 +76,6 @@ project-name: policy-pap jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/pap branch: master diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 12929bec8..3df4a959b 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - '{project-name}-gerrit-release-jobs': @@ -49,6 +49,6 @@ project-name: policy-parent jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/parent branch: master diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 288afe68b..0d2e581b7 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -10,7 +10,7 @@ build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: @@ -76,6 +76,6 @@ project-name: policy-xacml-pdp jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: policy/xacml-pdp branch: master diff --git a/jjb/portal-ng/portal-ng-history.yaml b/jjb/portal-ng/portal-ng-history.yaml new file mode 100644 index 000000000..b711bb499 --- /dev/null +++ b/jjb/portal-ng/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/portal-ng/portal-ng-ui.yaml b/jjb/portal-ng/portal-ng-ui.yaml new file mode 100644 index 000000000..784800e1d --- /dev/null +++ b/jjb/portal-ng/portal-ng-ui.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: portal-ng-ui-project-view + project-name: portal-ng-ui + views: + - project-view + +- project: + name: portal-ng-ui-info + project: portal-ng/ui + project-name: portal-ng-ui + build-node: centos8-builder-2c-1g + branch: master + jobs: + - gerrit-info-yaml-verify
\ No newline at end of file diff --git a/jjb/portal-ng/portal-ng.yaml b/jjb/portal-ng/portal-ng.yaml new file mode 100644 index 000000000..8bc5d1351 --- /dev/null +++ b/jjb/portal-ng/portal-ng.yaml @@ -0,0 +1,15 @@ +--- +- project: + name: portal-ng-project-view + project-name: portal-ng + views: + - project-view + +- project: + name: portal-ng-info + project: portal-ng + project-name: portal-ng + build-node: centos7-builder-2c-1g + branch: master + jobs: + - gerrit-info-yaml-verify
\ No newline at end of file diff --git a/jjb/relman/relman.yaml b/jjb/relman/relman.yaml index 94ba547b0..9bd197137 100644 --- a/jjb/relman/relman.yaml +++ b/jjb/relman/relman.yaml @@ -9,6 +9,6 @@ name: relman-info project: relman project-name: relman - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/rtdv3/rtdv3.yaml b/jjb/rtdv3/rtdv3.yaml index eb0d11ae8..2715743af 100644 --- a/jjb/rtdv3/rtdv3.yaml +++ b/jjb/rtdv3/rtdv3.yaml @@ -16,7 +16,7 @@ default-version: latest tox-dir: "docs/" doc-dir: "_build/html" - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g # the jjb is very short and filtering docs falsy raises side effects in # ONAP doc gerrit_trigger_file_paths: diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml deleted file mode 100644 index 0a894db11..000000000 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ /dev/null @@ -1,43 +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: - 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/sdc/sdc-sdc-helm-validator.yaml b/jjb/sdc/sdc-sdc-helm-validator.yaml index 26ca8fe42..987790423 100644 --- a/jjb/sdc/sdc-sdc-helm-validator.yaml +++ b/jjb/sdc/sdc-sdc-helm-validator.yaml @@ -27,6 +27,7 @@ maven-versions-plugin: true mvn-goals: 'clean deploy' - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-goals: 'clean install docker:build docker:push' diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index 409b1de62..68a03fcae 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -18,6 +18,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 6a754e5da..2a330ed43 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -55,6 +55,7 @@ mvn-version: 'mvn36' mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' - gerrit-maven-docker-stage: + sbom-generator: true build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-P docker -DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 7b4083201..65f8d3e04 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -18,11 +18,11 @@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' - sbom-generator: false + sbom-generator: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -31,17 +31,16 @@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos8-docker-8c-8g + build-node: centos7-docker-2c-8g project: 'sdnc/apps' stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk17 - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' @@ -74,7 +73,7 @@ mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' maven-version: "mvn38" # @@ -109,6 +108,7 @@ java-version: openjdk17 mvn-version : "mvn38" mvn-settings: 'sdnc-apps-settings' + mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED' - project: name: sdnc-apps-info diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml index c427e82f8..582fee02b 100644 --- a/jjb/sdnc/sdnc-csit.yaml +++ b/jjb/sdnc/sdnc-csit.yaml @@ -15,8 +15,6 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' - 'kohn': branch: 'kohn' mvn-settings: 'sdnc-oam-settings' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index d44904c08..48cec0d3b 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -8,21 +8,20 @@ cron: '@daily' - gerrit-maven-stage: sign-artifacts: true - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g cron: '' - sbom-generator: false + sbom-generator: true - '{project-name}-gerrit-release-jobs': - build-node: centos8-docker-8c-8g + build-node: centos7-docker-2c-8g project: 'sdnc/northbound' stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk17 - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 mvn-version: "mvn38" mvn-settings: 'sdnc-northbound-settings' @@ -55,7 +54,7 @@ mvn-goals: 'clean install' java-version: openjdk17 mvn-version: "mvn38" - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-opts: '-Xmx1024m' - project: name: sdnc-northbound-clm @@ -71,6 +70,7 @@ mvn-settings: 'sdnc-northbound-settings' java-version: openjdk17 mvn-version: 'mvn38' + mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED' - project: name: sdnc-northbound-info diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index da7a4cc4d..0fe22c557 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -9,11 +9,11 @@ cron: '@daily' mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-stage: - build-node: centos8-builder-4c-4g + build-node: centos8-docker-8c-8g sign-artifacts: true mvn-params: '-Dmaven.test.skip=true' cron: '' - sbom-generator: false + sbom-generator: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' @@ -22,16 +22,15 @@ maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': - build-node: centos8-docker-8c-8g + build-node: centos7-docker-2c-8g project: 'sdnc/oam' stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + java-version: openjdk17 - 'kohn': branch: 'kohn' - java-version: openjdk17 + java-version: openjdk11 mvn-version: "mvn38" mvn-settings: 'sdnc-oam-settings' files: '**' @@ -73,6 +72,7 @@ mvn-settings: 'sdnc-oam-settings' java-version: openjdk17 mvn-version: 'mvn38' + mvn-opts: '--add-opens=java.base/java.util=ALL-UNNAMED' - project: name: sdnc-oam-info diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml index ea3db2919..456cd9b99 100644 --- a/jjb/so/so-adapters-so-cnf-adapter.yaml +++ b/jjb/so/so-adapters-so-cnf-adapter.yaml @@ -9,7 +9,7 @@ name: so-adapters-so-cnf-adapter-info project: so/adapters/so-cnf-adapter project-name: so-adapters-so-cnf-adapter - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -21,7 +21,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g @@ -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-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml index a3f64f853..f1578f2b0 100644 --- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml @@ -9,7 +9,7 @@ name: so-adapters-so-etsi-sol003-adapter-info project: so/adapters/so-etsi-sol003-adapter project-name: so-adapters-so-etsi-sol003-adapter - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -21,7 +21,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml index cb16d5c15..f90c894db 100644 --- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml @@ -9,7 +9,7 @@ name: so-adapters-so-etsi-sol005-adapter-info project: so/adapters/so-etsi-sol005-adapter project-name: so-adapters-so-etsi-sol005-adapter - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -21,7 +21,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g @@ -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-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml index 6b14d6aa7..6e51b8b14 100644 --- a/jjb/so/so-adapters-so-nssmf-adapter.yaml +++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml @@ -9,7 +9,7 @@ name: so-adapters-so-nssmf-adapter-info project: so/adapters/so-nssmf-adapter project-name: so-adapters-so-nssmf-adapter - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -21,7 +21,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml index 5a37cf6b6..c59c8ba68 100644 --- a/jjb/so/so-adapters-so-oof-adapter.yaml +++ b/jjb/so/so-adapters-so-oof-adapter.yaml @@ -9,7 +9,7 @@ name: so-adapters-so-oof-adapter-info project: so/adapters/so-oof-adapter project-name: so-adapters-so-oof-adapter - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -21,7 +21,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g @@ -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/jjb/so/so-csit.yaml b/jjb/so/so-csit.yaml index 88896f94f..4eba714cb 100644 --- a/jjb/so/so-csit.yaml +++ b/jjb/so/so-csit.yaml @@ -19,4 +19,6 @@ trigger_jobs: - 'macroflow': trigger_jobs: + - 'integration-cnfm-testing': + trigger_jobs: robot-options: '' diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index 94cb8a2ce..c6f2e8a52 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -62,6 +62,6 @@ java-version: openjdk11 jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: so/libs branch: master diff --git a/jjb/so/so-so-admin-cockpit.yaml b/jjb/so/so-so-admin-cockpit.yaml index 0c268a57f..810b7396d 100644 --- a/jjb/so/so-so-admin-cockpit.yaml +++ b/jjb/so/so-so-admin-cockpit.yaml @@ -9,7 +9,7 @@ name: so-so-admin-cockpit-info project: so/so-admin-cockpit project-name: so-so-admin-cockpit - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -21,7 +21,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml index 3d5a2f5c1..40796c84d 100644 --- a/jjb/so/so-so-etsi-nfvo.yaml +++ b/jjb/so/so-so-etsi-nfvo.yaml @@ -9,7 +9,7 @@ name: so-so-etsi-nfvo-info project: so/so-etsi-nfvo project-name: so-so-etsi-nfvo - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify @@ -21,7 +21,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index cae94802b..7f3c1aaab 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -14,7 +14,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g @@ -111,7 +111,7 @@ java-version: openjdk11 jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: so stream: - 'master': diff --git a/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml index b1b3f54c2..269b5cbfe 100644 --- a/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml +++ b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml @@ -4,7 +4,7 @@ project-name: testsuite-pythonsdk-tests jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: testsuite/pythonsdk-tests branch: master diff --git a/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml b/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml index 7a4ad4d6b..ea463b6f4 100644 --- a/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml +++ b/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml @@ -9,6 +9,6 @@ name: testsuite-robot-utils-info project: testsuite/robot-utils project-name: testsuite-robot-utils - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/testsuite/testsuite-cds-mock-odl.yaml b/jjb/testsuite/testsuite-cds-mock-odl.yaml index 65c818c1f..7542c2be0 100644 --- a/jjb/testsuite/testsuite-cds-mock-odl.yaml +++ b/jjb/testsuite/testsuite-cds-mock-odl.yaml @@ -9,7 +9,7 @@ name: testsuite-cds-mock-odl-info project: testsuite/cds-mock-odl project-name: testsuite-cds-mock-odl - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/testsuite/testsuite-cds-mock-server.yaml b/jjb/testsuite/testsuite-cds-mock-server.yaml index c6bc7a308..62f712f54 100644 --- a/jjb/testsuite/testsuite-cds-mock-server.yaml +++ b/jjb/testsuite/testsuite-cds-mock-server.yaml @@ -9,7 +9,7 @@ name: testsuite-cds-mock-server-info project: testsuite/cds-mock-server project-name: testsuite-cds-mock-server - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/testsuite/testsuite-cds-mock-ssh.yaml b/jjb/testsuite/testsuite-cds-mock-ssh.yaml index 9fad20fa9..4c0ece378 100644 --- a/jjb/testsuite/testsuite-cds-mock-ssh.yaml +++ b/jjb/testsuite/testsuite-cds-mock-ssh.yaml @@ -9,7 +9,7 @@ name: testsuite-cds-mock-ssh-info project: testsuite/cds-mock-ssh project-name: testsuite-cds-mock-ssh - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/testsuite/testsuite-cds.yaml b/jjb/testsuite/testsuite-cds.yaml index 2fef96a11..77b460699 100644 --- a/jjb/testsuite/testsuite-cds.yaml +++ b/jjb/testsuite/testsuite-cds.yaml @@ -3,7 +3,7 @@ name: testsuite-cds-info project: testsuite/cds project-name: testsuite-cds - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g jobs: - gerrit-info-yaml-verify diff --git a/jjb/testsuite/testsuite-oom.yaml b/jjb/testsuite/testsuite-oom.yaml index 40b281a75..14ce6e46c 100644 --- a/jjb/testsuite/testsuite-oom.yaml +++ b/jjb/testsuite/testsuite-oom.yaml @@ -4,7 +4,7 @@ project-name: testsuite-oom jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: testsuite/oom branch: master diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index bc62ee4fb..db3e73034 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -34,7 +34,7 @@ project-name: testsuite jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: testsuite branch: master diff --git a/jjb/usecaseui/usecase-ui-intent-analysis.yaml b/jjb/usecaseui/usecase-ui-intent-analysis.yaml index 04095f20c..92cc787c7 100644 --- a/jjb/usecaseui/usecase-ui-intent-analysis.yaml +++ b/jjb/usecaseui/usecase-ui-intent-analysis.yaml @@ -15,7 +15,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-8c-8g @@ -67,6 +67,6 @@ project-name: usecase-ui-intent-analysis jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: usecase-ui/intent-analysis branch: master diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml index 0ea30f050..ef52d2c94 100644 --- a/jjb/usecaseui/usecase-ui-nlp.yaml +++ b/jjb/usecaseui/usecase-ui-nlp.yaml @@ -15,7 +15,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' @@ -61,7 +61,7 @@ project-name: usecase-ui-nlp jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: usecase-ui/nlp branch: master diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index 7933e36d4..86dfa309a 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -15,7 +15,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' @@ -61,6 +61,6 @@ project-name: usecase-ui-server jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: usecase-ui/server branch: master diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index 2c95ecfcf..518f73ef2 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -20,7 +20,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' @@ -49,6 +49,6 @@ project-name: usecase-ui jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: usecase-ui branch: master diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index e797c3f9c..4fc3df1a0 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -22,7 +22,7 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -70,6 +70,6 @@ project-name: vfc-gvnfm-vnflcm jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/gvnfm/vnflcm branch: master diff --git a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml index 190481392..5df66c4b6 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -16,7 +16,7 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -64,6 +64,6 @@ project-name: vfc-gvnfm-vnfmgr jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/gvnfm/vnfmgr branch: master diff --git a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml index 798f9fce2..54509ea25 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -17,7 +17,7 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -65,6 +65,6 @@ project-name: vfc-gvnfm-vnfres jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/gvnfm/vnfres branch: master diff --git a/jjb/vfc/vfc-nfvo-db.yaml b/jjb/vfc/vfc-nfvo-db.yaml index 679cc45e3..258ae31f2 100644 --- a/jjb/vfc/vfc-nfvo-db.yaml +++ b/jjb/vfc/vfc-nfvo-db.yaml @@ -13,7 +13,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -30,6 +30,6 @@ project-name: vfc-nfvo-db jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/nfvo/db branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 00d2d23fa..5d975c437 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -17,7 +17,7 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-pom: 'huawei/pom.xml' mvn-params: '-f huawei/pom.xml' @@ -65,6 +65,6 @@ java-version: openjdk11 jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/nfvo/driver/vnfm/svnfm branch: master diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index 212988365..e7796972b 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -17,7 +17,7 @@ - '{project-name}-{stream}-{subproject}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true mvn-pom: 'gvnfmadapter/pom.xml' mvn-params: '-f gvnfmadapter/pom.xml' @@ -67,6 +67,6 @@ project-name: vfc-nfvo-driver-vnfm-gvnfm jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/nfvo/driver/vnfm/gvnfm branch: master diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index add2502dd..24f98c12b 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -12,7 +12,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' @@ -59,6 +59,6 @@ project-name: vfc-nfvo-lcm jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: vfc/nfvo/lcm branch: master diff --git a/jjb/vnfrqts/vnfrqts-epics.yaml b/jjb/vnfrqts/vnfrqts-epics.yaml index f38f4d851..e86a69172 100644 --- a/jjb/vnfrqts/vnfrqts-epics.yaml +++ b/jjb/vnfrqts/vnfrqts-epics.yaml @@ -10,7 +10,7 @@ project: 'vnfrqts/epics' jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project-name: 'vnfrqts-epics' branch: 'master' mvn-settings: 'vnfrqts-epics-settings' diff --git a/jjb/vnfrqts/vnfrqts-guidelines.yaml b/jjb/vnfrqts/vnfrqts-guidelines.yaml index dbd30a7cf..6517277f5 100644 --- a/jjb/vnfrqts/vnfrqts-guidelines.yaml +++ b/jjb/vnfrqts/vnfrqts-guidelines.yaml @@ -4,7 +4,7 @@ project: 'vnfrqts/guidelines' jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project-name: 'vnfrqts-guidelines' branch: 'master' mvn-settings: 'vnfrqts-guidelines-settings' diff --git a/jjb/vnfrqts/vnfrqts-requirements.yaml b/jjb/vnfrqts/vnfrqts-requirements.yaml index e026fb464..a8fd39cc2 100644 --- a/jjb/vnfrqts/vnfrqts-requirements.yaml +++ b/jjb/vnfrqts/vnfrqts-requirements.yaml @@ -4,7 +4,7 @@ project: 'vnfrqts/requirements' jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project-name: 'vnfrqts-requirements' branch: 'master' mvn-settings: 'vnfrqts-requirements-settings' diff --git a/jjb/vnfrqts/vnfrqts-testcases.yaml b/jjb/vnfrqts/vnfrqts-testcases.yaml index a06e7edc6..13dcfe8cf 100644 --- a/jjb/vnfrqts/vnfrqts-testcases.yaml +++ b/jjb/vnfrqts/vnfrqts-testcases.yaml @@ -4,7 +4,7 @@ project: 'vnfrqts/testcases' jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project-name: 'vnfrqts-testcases' branch: 'master' mvn-settings: 'vnfrqts-testcases-settings' diff --git a/jjb/vnfrqts/vnfrqts-usecases.yaml b/jjb/vnfrqts/vnfrqts-usecases.yaml index 5070867d0..8d964c6f7 100644 --- a/jjb/vnfrqts/vnfrqts-usecases.yaml +++ b/jjb/vnfrqts/vnfrqts-usecases.yaml @@ -4,7 +4,7 @@ project: 'vnfrqts/usecases' jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project-name: 'vnfrqts-usecases' branch: 'master' mvn-settings: 'vnfrqts-usecases-settings' diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml index abeee9a63..77ef5e758 100644 --- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml +++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml @@ -68,7 +68,7 @@ name: vnfsdk-dovetail-integration-info jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: 'vnfsdk/dovetail-integration' project-name: 'vnfsdk-dovetail-integration' branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml index 2e2cfad0e..1b2dedd2b 100644 --- a/jjb/vnfsdk/vnfsdk-functest.yaml +++ b/jjb/vnfsdk/vnfsdk-functest.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true project: 'vnfsdk/functest' @@ -23,7 +23,7 @@ name: vnfsdk-functest-info jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: 'vnfsdk/functest' project-name: 'vnfsdk-functest' branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-lctest.yaml b/jjb/vnfsdk/vnfsdk-lctest.yaml index e2e365c8e..c1f2408ce 100644 --- a/jjb/vnfsdk/vnfsdk-lctest.yaml +++ b/jjb/vnfsdk/vnfsdk-lctest.yaml @@ -15,7 +15,7 @@ name: vnfsdk-lctest-info jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: 'vnfsdk/lctest' project-name: 'vnfsdk-lctest' branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-model.yaml b/jjb/vnfsdk/vnfsdk-model.yaml index 90763d213..5ef1b6796 100644 --- a/jjb/vnfsdk/vnfsdk-model.yaml +++ b/jjb/vnfsdk/vnfsdk-model.yaml @@ -4,7 +4,7 @@ project: 'vnfsdk/model' jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project-name: vnfsdk-model branch: master mvn-settings: vnfsdk-model-settings diff --git a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml index 6d22310e6..c39e25fba 100644 --- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml +++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml @@ -37,7 +37,7 @@ name: vnfsdk-pkgtools-info jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: 'vnfsdk/pkgtools' project-name: 'vnfsdk-pkgtools' branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index 615b4c36f..b10c1469f 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -7,10 +7,10 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g maven-versions-plugin: true mvn-goals: 'clean package -Pdocker' container-public-registry: 'nexus3.onap.org:10001' @@ -49,7 +49,7 @@ name: vnfsdk-refrepo-info jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: 'vnfsdk/refrepo' project-name: 'vnfsdk-refrepo' branch: 'master' @@ -79,7 +79,7 @@ sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'vnfsdk/refrepo' project-name: 'vnfsdk-refrepo' branch: 'master' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index 8f23c6e74..54cee4a0a 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -7,7 +7,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: true - build-node: centos7-builder-4c-4g + build-node: centos8-docker-4c-4g maven-versions-plugin: true - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -43,7 +43,7 @@ name: vnfsdk-validation-info jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g project: 'vnfsdk/validation' project-name: 'vnfsdk-validation' branch: 'master' @@ -88,7 +88,7 @@ sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' - build-node: centos7-docker-8c-8g + build-node: centos8-docker-8c-8g project: 'vnfsdk/validation' project-name: 'vnfsdk-validation' branch: 'master' diff --git a/jjb/vvp/vvp-documentation.yaml b/jjb/vvp/vvp-documentation.yaml index b0516ce3d..a57ee4290 100644 --- a/jjb/vvp/vvp-documentation.yaml +++ b/jjb/vvp/vvp-documentation.yaml @@ -7,4 +7,4 @@ branch: master jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g diff --git a/jjb/vvp/vvp-em.yaml b/jjb/vvp/vvp-em.yaml index a0870ada9..f30f0d4d9 100644 --- a/jjb/vvp/vvp-em.yaml +++ b/jjb/vvp/vvp-em.yaml @@ -7,4 +7,4 @@ branch: master jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g diff --git a/jjb/vvp/vvp-oom.yaml b/jjb/vvp/vvp-oom.yaml index 2a6b271a7..3c2442791 100644 --- a/jjb/vvp/vvp-oom.yaml +++ b/jjb/vvp/vvp-oom.yaml @@ -7,4 +7,4 @@ branch: master jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g diff --git a/jjb/vvp/vvp-regression.yaml b/jjb/vvp/vvp-regression.yaml index bea93c376..0de82d8a8 100644 --- a/jjb/vvp/vvp-regression.yaml +++ b/jjb/vvp/vvp-regression.yaml @@ -7,4 +7,4 @@ branch: master jobs: - gerrit-info-yaml-verify - build-node: centos7-builder-2c-1g + build-node: centos8-builder-2c-1g |