diff options
Diffstat (limited to 'jjb')
98 files changed, 431 insertions, 357 deletions
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml index 7b73388af..c94118e6b 100644 --- a/jjb/aaf/aaf-authz.yaml +++ b/jjb/aaf/aaf-authz.yaml @@ -47,7 +47,7 @@ # settings: '{mvn-settings}' # script: # !include-raw-escape: 'build-aaf-docker-image.sh' -# build-node: 'ubuntu1604-docker-arm64-4c-2g' +# build-node: 'ubuntu1804-docker-arm64-4c-2g' # project: 'aaf/authz' # stream: # - 'master': diff --git a/jjb/aaf/aaf-certservice.yaml b/jjb/aaf/aaf-certservice.yaml index 8efdb438f..3b4f67bf0 100644 --- a/jjb/aaf/aaf-certservice.yaml +++ b/jjb/aaf/aaf-certservice.yaml @@ -12,7 +12,7 @@ maven-deploy-properties: | deployAtEnd=true archive-artifacts: '' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g jobs: - '{project-name}-{stream}-verify-java': mvn-goals: 'clean install' @@ -26,7 +26,7 @@ maven-versions-plugin: true mvn-goals: 'clean deploy -P docker' - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-P docker -DskipTests=true -DskipNexusStagingDeployMojo=true -DskipDockerPush=false' @@ -44,7 +44,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'aaf/certservice' project-name: 'aaf-certservice' branch: 'master' diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index 68f694057..4bf96469f 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -26,8 +26,6 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' mvn-settings: 'aai-graphgraph-settings' files: '**' archive-artifacts: '' @@ -41,21 +39,3 @@ project: aai/graphgraph branch: master -- project: - name: aai-graphgraph-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: '{sonarcloud_project_organization}' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: '{sonar_mvn_goal}' - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'aai/graphgraph' - project-name: 'aai-graphgraph' - branch: 'master' - mvn-settings: 'aai-sparky-be-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - mvn-version: 'mvn35' diff --git a/jjb/aai/aai-oom.yaml b/jjb/aai/aai-oom.yaml index 0e9bac8e0..9b92ea138 100644 --- a/jjb/aai/aai-oom.yaml +++ b/jjb/aai/aai-oom.yaml @@ -25,7 +25,7 @@ mvn-settings: 'aai-oom-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-helm-2c-1g + build-node: ubuntu1804-helm-2c-1g pre_build_script: !include-raw-escape: shell/helm-repo-init.sh oom_build_script: | #!/bin/bash diff --git a/jjb/appc/appc-cdt.yaml b/jjb/appc/appc-cdt.yaml index 9a2c1900c..8a3f8e83b 100644 --- a/jjb/appc/appc-cdt.yaml +++ b/jjb/appc/appc-cdt.yaml @@ -19,7 +19,7 @@ mvn-settings: 'appc-cdt-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: appc-cdt-clm diff --git a/jjb/appc/appc-deployment.yaml b/jjb/appc/appc-deployment.yaml index a4ef267b8..4fdbb66eb 100644 --- a/jjb/appc/appc-deployment.yaml +++ b/jjb/appc/appc-deployment.yaml @@ -17,7 +17,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: appc-deployment-docker @@ -28,7 +28,7 @@ - 'docker-version-java-daily': mvn-params: '-Dmaven.test.skip=true' - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g mvn-params: '-Dmaven.test.skip=true -P docker' maven-versions-plugin: true mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" @@ -45,7 +45,7 @@ archive-artifacts: '' docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g #- project: # name: appc-deployment-arm64-docker @@ -64,7 +64,7 @@ # archive-artifacts: '' # docker-pom: 'pom.xml' # mvn-profile: docker -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g - project: name: appc-deployment-info diff --git a/jjb/appc/appc-master.yaml b/jjb/appc/appc-master.yaml index dd7353f9b..404fe9e09 100644 --- a/jjb/appc/appc-master.yaml +++ b/jjb/appc/appc-master.yaml @@ -4,11 +4,11 @@ project-name: 'appc' jobs: - '{project-name}-{stream}-verify-java': - build-node: ubuntu1604-builder-8c-8g + build-node: ubuntu1804-builder-8c-8g mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - '{project-name}-{stream}-merge-java': - build-node: ubuntu1604-builder-8c-8g + build-node: ubuntu1804-builder-8c-8g mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" java-opts: "-Xmx4000m -XX:MaxPermSize=256m" - gerrit-maven-stage: @@ -30,7 +30,7 @@ maven-version: "mvn35" files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: appc-sonar @@ -42,7 +42,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-8c-8g + build-node: ubuntu1804-builder-8c-8g project: 'appc' project-name: 'appc' branch: 'master' @@ -57,7 +57,7 @@ - gerrit-maven-clm: mvn-params: '-DskipTests' build-timeout: 60 - build-node: ubuntu1604-builder-8c-8g + build-node: ubuntu1804-builder-8c-8g mvn-opts: "-Xmx4000m -XX:MaxPermSize=256m" nexus-iq-namespace: 'onap-' project: 'appc' diff --git a/jjb/appc/appc-parent.yaml b/jjb/appc/appc-parent.yaml index 897028cb3..2ada1b0b0 100644 --- a/jjb/appc/appc-parent.yaml +++ b/jjb/appc/appc-parent.yaml @@ -24,7 +24,7 @@ branch: 'master' mvn-settings: 'appc-parent-settings' maven-version: "mvn35" - build-node: ubuntu1604-builder-2c-1g + build-node: ubuntu1804-builder-4c-4g - project: name: appc-parent-info diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 8b2ec47b0..c6c3f56b1 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -17,7 +17,7 @@ sign-artifacts: true cron: '' - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' @@ -41,7 +41,7 @@ files: '**' archive-artifacts: '' maven-version: "mvn35" - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -55,7 +55,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'ccsdk/apps' project-name: 'ccsdk-apps' branch: 'master' @@ -78,7 +78,7 @@ branch: 'frankfurt' mvn-settings: 'ccsdk-apps-settings' maven-version: "mvn35" - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g #- project: # name: ccsdk-apps-arm64-docker @@ -95,7 +95,7 @@ # archive-artifacts: '' # docker-pom: 'pom.xml' # mvn-profile: docker -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g - project: name: ccsdk-apps-info diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index d8395bab5..beb0c1713 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -12,7 +12,7 @@ maven-versions-plugin: true cron: '' - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' @@ -26,6 +26,8 @@ stream: - 'master': branch: 'master' + - 'elalto': + branch: 'elalto' - 'frankfurt': branch: 'frankfurt' mvn-settings: 'ccsdk-cds-settings' @@ -37,7 +39,7 @@ files: '**' archive-artifacts: '' maven-version: "mvn35" - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -51,7 +53,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'ccsdk/cds' project-name: 'ccsdk-cds' branch: 'master' @@ -74,7 +76,7 @@ branch: 'frankfurt' mvn-settings: 'ccsdk-cds-settings' maven-version: "mvn35" - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml index 764aba88a..353ee2d67 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.yaml @@ -12,7 +12,7 @@ - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' @@ -32,7 +32,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index b9cd8faba..218bd2b9c 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -12,7 +12,7 @@ maven-versions-plugin: true cron: '' - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' @@ -33,7 +33,7 @@ maven-version: "mvn35" docker-pom: 'pom.xml' mvn-profile: docker - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -53,7 +53,7 @@ # archive-artifacts: '' # docker-pom: 'pom.xml' # mvn-profile: docker -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # - project: name: ccsdk-distribution-clm @@ -68,7 +68,7 @@ - 'frankfurt': branch: 'frankfurt' mvn-settings: 'ccsdk-distribution-settings' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - project: @@ -83,7 +83,7 @@ - project: name: ccsdk-distribution-whitesource project-name: ccsdk-distribution - build-node: ubuntu1604-builder-8c-8g + build-node: ubuntu1804-builder-8c-8g jobs: - gerrit-whitesource-scan: java-opts: '-Xmx2048m' diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 0a0120eb3..d5fb682f7 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -29,7 +29,7 @@ archive-artifacts: '' maven-version: "mvn35" mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -43,7 +43,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'ccsdk/features' project-name: 'ccsdk-features' branch: 'master' @@ -66,7 +66,7 @@ branch: 'frankfurt' mvn-settings: 'ccsdk-features-settings' maven-version: "mvn35" - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: ccsdk-features-info @@ -79,7 +79,7 @@ - project: name: ccsdk-features-whitesource - build-node: ubuntu1604-builder-8c-8g + build-node: ubuntu1804-builder-8c-8g project-name: ccsdk-features jobs: - gerrit-whitesource-scan diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index a29b09607..0d3a3ee2c 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -45,7 +45,7 @@ branch: 'frankfurt' mvn-settings: 'ccsdk-parent-settings' maven-version: "mvn35" - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index 8b65dc8f5..0f2f046c9 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -31,7 +31,7 @@ files: '**' archive-artifacts: '' maven-version: "mvn35" - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -45,7 +45,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'ccsdk/sli/adaptors' project-name: 'ccsdk-sli-adaptors' branch: 'master' @@ -68,7 +68,7 @@ branch: 'frankfurt' mvn-settings: 'ccsdk-sli-adaptors-settings' maven-version: "mvn35" - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: @@ -82,7 +82,7 @@ - project: name: ccsdk-sli-adaptors-whitesource - build-node: ubuntu1604-builder-8c-8g + build-node: ubuntu1804-builder-8c-8g project-name: ccsdk-sli-adaptors jobs: - gerrit-whitesource-scan diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 946a4fb4f..0fc6d6c94 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -31,7 +31,7 @@ files: '**' archive-artifacts: '' maven-version: "mvn35" - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -45,7 +45,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'ccsdk/sli/core' project-name: 'ccsdk-sli-core' branch: 'master' @@ -68,7 +68,7 @@ branch: 'frankfurt' mvn-settings: 'ccsdk-sli-core-settings' maven-version: "mvn35" - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index 8cd692b0f..d130cb121 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -31,7 +31,7 @@ files: '**' archive-artifacts: '' maven-version: "mvn35" - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -45,7 +45,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'ccsdk/sli/northbound' project-name: 'ccsdk-sli-northbound' branch: 'master' @@ -68,7 +68,7 @@ branch: 'frankfurt' mvn-settings: 'ccsdk-sli-northbound-settings' maven-version: "mvn35" - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index aec06dbc8..4f99ad87d 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -31,7 +31,7 @@ files: '**' archive-artifacts: '' maven-version: "mvn35" - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -45,7 +45,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'ccsdk/sli/plugins' project-name: 'ccsdk-sli-plugins' branch: 'master' diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml index d292bf4e8..f8014bf95 100644 --- a/jjb/ci-management/ci-management-packer-jobs.yaml +++ b/jjb/ci-management/ci-management-packer-jobs.yaml @@ -15,7 +15,6 @@ platforms: - centos-7 - ubuntu-16.04 - - ubuntu-16.04-arm64 - ubuntu-18.04 templates: builder @@ -35,7 +34,7 @@ platforms: - centos-7 - ubuntu-16.04 - - ubuntu-16.04-arm64 + - ubuntu-18.04-arm64 - ubuntu-18.04 templates: docker @@ -53,8 +52,7 @@ build-timeout: 90 platforms: - - centos-7 - - ubuntu-16.04 + - ubuntu-18.04 templates: memcached - project: @@ -86,5 +84,5 @@ build-node: centos7-builder-2c-1g platforms: - - ubuntu-16.04 + - ubuntu-18.04 templates: helm diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index c21ae21fc..ef105ffab 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -54,7 +54,7 @@ # mvn-settings: 'cli-settings' # files: '**' # archive-artifacts: '' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # - project: name: cli-sonar diff --git a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml index 49a1d5337..fa3ad68c6 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-pnda.yaml @@ -13,7 +13,7 @@ maven-deploy-properties: | deployAtEnd=true archive-artifacts: '' - build-node: 'ubuntu1604-docker-v1-8c-8g' + build-node: 'ubuntu1804-docker-v1-8c-8g' build-timeout: 300 jobs: - '{project-name}-{stream}-verify-java' diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index 0b97d5abc..197660a4e 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -25,7 +25,10 @@ mvn-goals: 'clean deploy docker:build -DpushImage' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true - project: name: dcaegen2-analytics-tca-gen2-sonar jobs: diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index c07a54608..d31538d80 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -20,7 +20,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-docker-v1-8c-8g' + build-node: 'ubuntu1804-docker-v1-8c-8g' build-timeout: 180 - project: diff --git a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml index 685582e51..3f561407a 100644 --- a/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-docker-python-subprojects.yaml @@ -50,7 +50,17 @@ stream: all branch: '*' - gerrit-docker-verify - - gerrit-docker-merge + - 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 diff --git a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml index a3fd2edce..eec174ab5 100644 --- a/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml +++ b/jjb/dcaegen2/dcaegen2-services-bbs-eventprocessor-java.yaml @@ -72,7 +72,7 @@ branch: 'master' mvn-settings: 'dcaegen2-services-settings' mvn-params: '-f components/bbs-event-processor/pom.xml' - mvn-goals: 'clean install' + mvn-goals: 'clean install -Ddockerfile.skip' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index c8e76d939..4b43e2c5e 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -39,8 +39,6 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' pattern: 'components/datalake-handler/**' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g stream: - 'master': branch: 'master' @@ -70,39 +68,6 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' pattern: 'components/datalake-handler/**' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - stream: - - 'master': - branch: 'master' - mvn-settings: 'dcaegen2-services-settings' - maven-deploy-properties: | - deployAtEnd=true - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' - -- project: - name: dcaegen2-services-datalake-handler-db-init-release - project: 'dcaegen2/services' - project-name: 'dcaegen2-services-datalake-handler-db-init' - jobs: - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - mvn-pom: 'components/datalake-handler/pom.xml' - mvn-params: '-f components/datalake-handler/pom.xml' - version-properties-file: 'components/datalake-handler/version.properties' - pattern: 'components/datalake-handler/**' - - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g - mvn-goals: 'clean package dockerfile:build dockerfile:push -f components/datalake-handler/init_db/pom.xml' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - pattern: 'components/datalake-handler/**' - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g stream: - 'master': branch: 'master' diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml index be95546f1..1c2dd5984 100644 --- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml @@ -57,7 +57,16 @@ stream: master branch: 'master' - gerrit-docker-verify - - gerrit-docker-merge + - 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-whitesource-scan: build-timeout: 120 submodule-timeout: 30 diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml index ebf695c76..71ca922b9 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -42,7 +42,7 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dmaven.test.skip=true' - build-node: 'ubuntu1604-docker-arm64-4c-2g' + build-node: 'ubuntu1804-docker-arm64-4c-2g' project: 'externalapi/nbi' stream: - 'master': diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index 1590d0134..74479f299 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -38,7 +38,7 @@ # Timeout in minutes build-timeout: 90 - build-node: ubuntu1604-builder-2c-1g + build-node: ubuntu1804-builder-4c-4g archive-artifacts: '' diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index c78301521..9c70eec4f 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -403,7 +403,7 @@ exclude-no-code-change: 'false' - draft-published-event - comment-added-contains-event: - comment-contains-value: '^verify-helm$' + comment-contains-value: '^Patch Set\s+\d+:\s+(recheck|reverify|verify-helm)\s*$' projects: - project-compare-type: 'ANT' project-pattern: '{project}' diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml index 6305828d9..261515754 100644 --- a/jjb/global-templates-golang.yaml +++ b/jjb/global-templates-golang.yaml @@ -1,5 +1,5 @@ --- -- job-template: +- job-template: &verify_golang_bolierplate # Job template for Golang verify jobs # # The purpose of this job template is to run: @@ -72,6 +72,12 @@ maven-version: '{maven-version}' - job-template: + # Job template for Golang verify jobs with subproject support + + <<: *verify_golang_bolierplate + name: '{project-name}-{stream}-{subproject}-verify-golang' + +- job-template: # Job template for Golang merge jobs # # The purpose of this job template is to run: diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml index 12ce9a383..a147e1a51 100644 --- a/jjb/global-templates-helm.yaml +++ b/jjb/global-templates-helm.yaml @@ -20,6 +20,7 @@ submodule-disable: false submodule-recursive: true submodule-timeout: 10 + build-timeout: 120 ##################### # Job Configuration # @@ -55,6 +56,7 @@ # Job template for helm verify jobs <<: *helm_job_boiler_plate + concurrent: true scm: - gerrit-trigger-scm: diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml index b7b92fde5..40a6a93ff 100644 --- a/jjb/integration/integration-templates-csit.yaml +++ b/jjb/integration/integration-templates-csit.yaml @@ -4,7 +4,7 @@ disabled: '{disabled}' project-type: freestyle - build-node: 'ubuntu1604-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' node: '{build-node}' recipients: '' java-version: 'openjdk11' @@ -66,7 +66,7 @@ disabled: false project-type: freestyle - build-node: 'ubuntu1604-docker-arm64-4c-2g' + build-node: 'ubuntu1804-docker-arm64-4c-2g' node: '{build-node}' recipients: '' java-version: 'openjdk11' @@ -128,7 +128,7 @@ disabled: false project-type: freestyle - build-node: 'ubuntu1604-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' node: '{build-node}' recipients: '' java-version: 'openjdk11' @@ -212,7 +212,7 @@ disabled: false project-type: freestyle - build-node: 'ubuntu1604-docker-arm64-4c-2g' + build-node: 'ubuntu1804-docker-arm64-4c-2g' node: '{build-node}' recipients: '' java-version: 'openjdk11' @@ -296,7 +296,7 @@ disabled: '{disabled}' project-type: freestyle - build-node: 'ubuntu1604-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' node: '{build-node}' recipients: '' java-version: 'openjdk11' @@ -361,7 +361,7 @@ disabled: false project-type: freestyle - build-node: 'ubuntu1604-docker-arm64-4c-2g' + build-node: 'ubuntu1804-docker-arm64-4c-2g' node: '{build-node}' recipients: '' java-version: 'openjdk11' @@ -426,7 +426,7 @@ disabled: false project-type: freestyle - build-node: 'ubuntu1604-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' node: '{build-node}' recipients: '' java-version: 'openjdk11' @@ -513,7 +513,7 @@ disabled: false project-type: freestyle - build-node: 'ubuntu1604-docker-arm64-4c-2g' + build-node: 'ubuntu1804-docker-arm64-4c-2g' node: '{build-node}' recipients: '' java-version: 'openjdk11' diff --git a/jjb/integration/integration-templates.yaml b/jjb/integration/integration-templates.yaml index 0cf19bcff..7d9ffed21 100644 --- a/jjb/integration/integration-templates.yaml +++ b/jjb/integration/integration-templates.yaml @@ -8,7 +8,7 @@ name: '{project-name}-{stream}-verify-vagrantfile' project-type: freestyle description: 'Job intended for validating vagrantfiles' - node: ubuntu1604-builder-2c-1g + node: ubuntu1804-builder-4c-4g parameters: - lf-infra-parameters: @@ -56,7 +56,8 @@ name: '{project-name}-{stream}-{subproject}-lint' project-type: freestyle description: 'Job intended for running linters with Tox and Coala' - node: ubuntu1604-builder-2c-1g + build-node: ubuntu1804-builder-4c-4g + node: '{build-node}' parameters: - lf-infra-parameters: diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index 2c2d89fbf..ef112ea20 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -49,20 +49,33 @@ golangver: 'golang112' mvn-settings: 'integration-settings' archive-artifacts: '' - build-node: ubuntu1604-builder-2c-1g jobs: - - '{project-name}-{stream}-verify-golang': - script: '{build_script}' - path: 'test/security/k8s' - pattern: '{path}/**' + - '{project-name}-{stream}-{subproject}-verify-golang' + subproject: + - 'test-security-k8s': + path: 'test/security/k8s' + pattern: '{path}/**' + build-node: ubuntu1804-builder-4c-4g + script: | + #!/bin/bash + set -ex # Fail build if any setup step fails + cd $WORKSPACE/{path} + make test + - 'test-security-sslendpoints': + path: 'test/security/sslendpoints' + pattern: '{path}/**' + build-node: ubuntu1804-docker-8c-8g + script: | + #!/bin/bash + set -ex # Fail build if any setup step fails + cd $WORKSPACE/{path} + rm -rf $WORKSPACE/{path}/bin + make docker-build + make test + make clean stream: - 'master': branch: 'master' - build_script: | - #!/bin/bash - set -ex # Fail build if any setup step fails - cd test/security/k8s - make test - project: name: integration-netconf-pnp-simulator @@ -79,6 +92,7 @@ docker-name: 'onap/integration/simulators/netconf-pnp-simulator' docker-root: test/mocks/netconf-pnp-simulator/engine container-tag-method: yaml-file + post_docker_build_script: !include-raw-escape: ../global-jjb/shell/tox-run.sh build-node: centos7-docker-8c-8g build-timeout: 20 jobs: diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml new file mode 100644 index 000000000..584d93f33 --- /dev/null +++ b/jjb/integration/simulators/integration-ran-simulator.yaml @@ -0,0 +1,33 @@ +--- +- project: + name: integration-simulators-ran-simulator-info + project-name: integration-simulators-ran-simulator + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: integration/simulators/ran-simulator + branch: master + +- project: + name: integration-simulators-ran-simulator-linters + project: integration/simulators/ran-simulator + project-name: integration-simulators-ran-simulator + python-version: python3 + jobs: + - '{project-name}-{stream}-{subproject}-lint' + subproject: + - 'yaml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yaml' + - 'yml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yml' + - 'json': + tox-dir: '.' + tox-envs: 'json' + pattern: '**/*.json' + stream: + - 'master': + branch: 'master' diff --git a/jjb/integration/usecases/integration-usecases-bbs.yaml b/jjb/integration/usecases/integration-usecases-bbs.yaml new file mode 100644 index 000000000..fbf56a4a6 --- /dev/null +++ b/jjb/integration/usecases/integration-usecases-bbs.yaml @@ -0,0 +1,33 @@ +--- +- project: + name: integration-usecases-bbs-info + project-name: integration-usecases-bbs + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: integration/usecases/bbs + branch: master + +- project: + name: integration-usecases-bbs-linters + project: integration/usecases/bbs + project-name: integration-usecases-bbs + python-version: python3 + jobs: + - '{project-name}-{stream}-{subproject}-lint' + subproject: + - 'yaml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yaml' + - 'yml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yml' + - 'json': + tox-dir: '.' + tox-envs: 'json' + pattern: '**/*.json' + stream: + - 'master': + branch: 'master' diff --git a/jjb/lab/lab-templates.yaml b/jjb/lab/lab-templates.yaml index ff7a59d40..234d1fc86 100644 --- a/jjb/lab/lab-templates.yaml +++ b/jjb/lab/lab-templates.yaml @@ -4,7 +4,7 @@ description: '{job-desc}' disabled: false project-type: freestyle - build-node: ubuntu1604-builder-2c-1g + build-node: ubuntu1804-builder-4c-4g properties: - lf-infra-properties: diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml index 4ef180159..f0eab70c1 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-aai-context-builder.yaml @@ -44,7 +44,7 @@ # mvn-settings: logging-analytics-pomba-pomba-aai-context-builder-settings # files: '**' # archive-artifacts: '' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # maven-version: 'mvn35' # - project: diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml index 82317ba6c..3f064c4ef 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-network-discovery-context-builder.yaml @@ -44,7 +44,7 @@ # mvn-settings: logging-analytics-pomba-pomba-network-discovery-context-builder-settings # files: '**' # archive-artifacts: '' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # maven-version: 'mvn35' # - project: diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml index ba9cf5d30..41855fc17 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdc-context-builder.yaml @@ -42,7 +42,7 @@ # mvn-settings: logging-analytics-pomba-pomba-sdc-context-builder-settings # files: '**' # archive-artifacts: '' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # maven-version: 'mvn35' # - project: diff --git a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml index a40fda157..90126a0c5 100644 --- a/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml +++ b/jjb/logging-analytics/logging-analytics-pomba-pomba-sdnc-context-builder.yaml @@ -41,7 +41,7 @@ # mvn-settings: logging-analytics-pomba-pomba-sdnc-context-builder-settings # files: '**' # archive-artifacts: '' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # - project: name: logging-analytics-pomba-pomba-sdnc-context-builder-sonar diff --git a/jjb/logging-analytics/logging-analytics.yaml b/jjb/logging-analytics/logging-analytics.yaml index 6e6b2893a..159f3572d 100644 --- a/jjb/logging-analytics/logging-analytics.yaml +++ b/jjb/logging-analytics/logging-analytics.yaml @@ -50,7 +50,7 @@ # mvn-settings: 'logging-analytics-settings' # files: '**' # archive-artifacts: '' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # - project: diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml index a58af1cc9..28248e332 100644 --- a/jjb/modeling/modeling-etsicatalog.yaml +++ b/jjb/modeling/modeling-etsicatalog.yaml @@ -26,6 +26,8 @@ script: !include-raw-escape: 'build-modeling-etsicatalog-docker-image.sh' build-node: ubuntu1604-docker-8c-8g + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' build-node: centos7-redis-4c-4g diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index cc07972d4..3fc4d3326 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -22,6 +22,8 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-f distributions/msb-apigateway/pom.xml -Dmaven.test.skip=true -P linux,docker' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'msb/apigateway' stream: - 'master': @@ -48,7 +50,7 @@ # mvn-settings: 'msb-apigateway-settings' # files: '**' # archive-artifacts: '' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # - project: name: msb-apigateway-sonar diff --git a/jjb/msb/msb-discovery.yaml b/jjb/msb/msb-discovery.yaml index 67eca0a5d..cbe550524 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -16,6 +16,8 @@ container-staging-registry: 'nexus3.onap.org:10003' mvn-pom: 'distributions/msb-discovery/pom.xml' mvn-params: '-f distributions/msb-discovery/pom.xml -Dmaven.test.skip=true -P linux,docker' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'msb/discovery' stream: - 'master': @@ -34,7 +36,7 @@ # mvn-goals: 'install' # script: # !include-raw-escape: 'build-discovery-docker-image.sh' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # project: 'msb/discovery' # stream: # - 'master': diff --git a/jjb/multicloud/multicloud-azure-java.yaml b/jjb/multicloud/multicloud-azure-java.yaml index 270a557ce..da9827bc0 100644 --- a/jjb/multicloud/multicloud-azure-java.yaml +++ b/jjb/multicloud/multicloud-azure-java.yaml @@ -21,7 +21,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-goals: install mvn-params: '-P docker' maven-versions-plugin: true @@ -29,7 +29,7 @@ container-staging-registry: 'nexus3.onap.org:10003' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-2g + build-node: ubuntu1804-builder-4c-4g #- project: # name: multicloud-azure-arm64-java @@ -51,7 +51,7 @@ # !include-raw-escape: 'build-multicloud-azure-docker-image.sh' # files: '**' # archive-artifacts: '' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # - project: name: multicloud-azure-sonar @@ -63,7 +63,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/azure' project-name: 'multicloud-azure' branch: 'master' diff --git a/jjb/multicloud/multicloud-azure-python.yaml b/jjb/multicloud/multicloud-azure-python.yaml index 5066a4cca..8aec29b5e 100644 --- a/jjb/multicloud/multicloud-azure-python.yaml +++ b/jjb/multicloud/multicloud-azure-python.yaml @@ -7,7 +7,7 @@ - 'master': branch: 'master' mvn-settings: 'multicloud-azure-settings' - build-node: 'ubuntu1604-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' subproject: - 'azure': path: 'azure' diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 1883da9a4..323311824 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -20,7 +20,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-goals: install mvn-params: '-P docker' maven-versions-plugin: true @@ -34,7 +34,7 @@ build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g #- project: # name: multicloud-framework-arm64-java @@ -56,7 +56,7 @@ # !include-raw-escape: 'build-multicloud-framework-docker-image.sh' # files: '**' # archive-artifacts: '' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # - project: name: multicloud-framework-multivimbroker-sonar @@ -68,7 +68,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/framework' project-name: 'multicloud-framework-multivimbroker' branch: 'master' @@ -98,7 +98,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/framework' project-name: 'multicloud-framework-artifactbroker' branch: 'master' diff --git a/jjb/multicloud/multicloud-framework-python.yaml b/jjb/multicloud/multicloud-framework-python.yaml index c8b4b35ad..d81081a1d 100644 --- a/jjb/multicloud/multicloud-framework-python.yaml +++ b/jjb/multicloud/multicloud-framework-python.yaml @@ -7,7 +7,7 @@ - 'master': branch: 'master' mvn-settings: 'multicloud-framework-settings' - build-node: 'ubuntu1604-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' subproject: - 'multivimbroker': path: 'multivimbroker' diff --git a/jjb/multicloud/multicloud-k8s.yaml b/jjb/multicloud/multicloud-k8s.yaml index f8cf56fff..2995e7bfd 100644 --- a/jjb/multicloud/multicloud-k8s.yaml +++ b/jjb/multicloud/multicloud-k8s.yaml @@ -48,7 +48,7 @@ # mvn-settings: 'multicloud-k8s-settings' # files: '**' # archive-artifacts: '' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g - project: name: multicloud-k8s-info diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index ba897bce8..4dad5cb27 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -17,7 +17,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-goals: install mvn-params: '-P docker' maven-versions-plugin: true @@ -31,7 +31,7 @@ build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g #- project: # name: multicloud-openstack-vmware-arm64-java @@ -51,7 +51,7 @@ # mvn-goals: 'install' # script: # !include-raw-escape: 'build-multicloud-openstack-vmware-docker-image.sh' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # files: '**' # archive-artifacts: '' # @@ -65,7 +65,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/openstack/vmware' project-name: 'multicloud-openstack-vmware' branch: 'master' @@ -80,7 +80,7 @@ nexus-iq-namespace: 'onap-' project: multicloud/openstack/vmware project-name: 'multicloud-openstack-vmware' - build-node: 'ubuntu1604-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' branch: 'master' mvn-settings: 'multicloud-openstack-vmware-settings' diff --git a/jjb/multicloud/multicloud-openstack-vmware-python.yaml b/jjb/multicloud/multicloud-openstack-vmware-python.yaml index a23ecf3d4..973ca5162 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-python.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-python.yaml @@ -7,7 +7,7 @@ - 'master': branch: 'master' mvn-settings: 'multicloud-openstack-vmware-settings' - build-node: 'ubuntu1604-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' subproject: - 'vio': path: 'vio' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 1bdc5b9bc..764748fd1 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -91,7 +91,7 @@ # mvn-goals: 'install' # script: # !include-raw-escape: 'build-multicloud-openstack-docker-image.sh' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # files: '**' # archive-artifacts: '' # @@ -106,7 +106,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/openstack' project-name: 'multicloud-openstack-windriver' branch: 'master' @@ -125,7 +125,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/openstack' project-name: 'multicloud-openstack-pike' branch: 'master' @@ -144,7 +144,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/openstack' project-name: 'multicloud-openstack-starlingx' branch: 'master' @@ -160,7 +160,7 @@ nexus-iq-namespace: 'onap-' project: multicloud/openstack project-name: 'multicloud-openstack' - build-node: ubuntu1604-memcached-4c-4g + build-node: ubuntu1804-memcached-4c-4g branch: 'master' mvn-settings: 'multicloud-openstack-settings' @@ -174,7 +174,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/openstack' project-name: 'multicloud-openstack-fcaps' branch: 'master' @@ -193,7 +193,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' # cron: '@daily' -# build-node: ubuntu1604-builder-4c-4g +# build-node: ubuntu1804-builder-4c-4g # project: 'multicloud/openstack' # project-name: 'multicloud-openstack-lenovo' # branch: 'master' @@ -212,7 +212,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'multicloud/openstack' project-name: 'multicloud-openstack-hpa' branch: 'master' diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index c276629e1..5868f9fa1 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -6,7 +6,7 @@ mvn-settings: oom-settings mvn-global-settings: global-settings archive-artifacts: '' - build-node: ubuntu1604-helm-2c-1g + build-node: ubuntu1804-helm-2c-1g pre_build_script: !include-raw-escape: shell/helm-repo-init.sh oom_build_script: | #!/bin/bash diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index 4b5a3b3fe..d625aba44 100644 --- a/jjb/oom/oom-registrator.yaml +++ b/jjb/oom/oom-registrator.yaml @@ -16,6 +16,8 @@ script: !include-raw-escape: 'build-registrator-docker-image.sh' build-node: ubuntu1604-docker-8c-8g + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'oom/registrator' stream: - 'master': diff --git a/jjb/optf/optf-has-csit.yaml b/jjb/optf/optf-has-csit.yaml index 583703ca6..73b2771f0 100644 --- a/jjb/optf/optf-has-csit.yaml +++ b/jjb/optf/optf-has-csit.yaml @@ -1,6 +1,7 @@ - project: name: optf-has-csit jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: optf-has recipients: 'snarayanan@research.att.com' diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index b94af567d..c657540f1 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -15,10 +15,10 @@ pattern: 'conductor/**' pom: 'pom.xml' jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-{subproject}-verify-python': + build-node: ubuntu1804-builder-4c-4g + - '{project-name}-{stream}-{subproject}-merge-java': + build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-docker-8c-8g @@ -26,48 +26,16 @@ - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' docker-pom: 'conductor/pom.xml' - mvn-goals: 'install' mvn-params: '-Dmaven.test.skip=true -P docker' files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-builder-4c-4g' - -- project: - name: optf-has-docker - project-name: 'optf-has' - project: 'optf/has' - stream: - - 'master': - branch: 'master' - - 'elalto': - branch: 'elalto' - mvn-settings: 'optf-has-settings' - subproject: - - 'conductor': - path: 'conductor' - pattern: 'conductor/**' - pom: 'pom.xml' - jobs: - - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - mvn-params: '-Dmaven.test.skip=true' - script: - !include-raw-escape: 'build-optf-has-docker-image.sh' - build-node: queue-docker-4c-4g - - '{project-name}-{stream}-{subproject}-docker-java-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - mvn-params: '-Dmaven.test.skip=true' - script: - !include-raw-escape: 'build-optf-has-docker-image.sh' - build-node: queue-docker-4c-4g + build-node: 'ubuntu1804-builder-4c-4g' - project: name: optf-has-sonar @@ -79,7 +47,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-docker-8c-8g project: 'optf/has' project-name: 'optf-has' branch: 'master' @@ -94,6 +62,7 @@ nexus-iq-namespace: 'onap-' project: optf/has project-name: 'optf-has' + build-node: ubuntu1804-docker-8c-8g stream: - 'master': branch: 'master' diff --git a/jjb/optf/optf-osdf-csit.yaml b/jjb/optf/optf-osdf-csit.yaml index 995118400..7a9c7fc8b 100644 --- a/jjb/optf/optf-osdf-csit.yaml +++ b/jjb/optf/optf-osdf-csit.yaml @@ -1,6 +1,7 @@ - project: name: optf-osdf-csit jobs: + - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: optf-osdf recipients: 'snarayanan@research.att.com' diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index b4884b752..2607b1f3f 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -36,7 +36,7 @@ files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' - project: name: optf-osdf-sonar @@ -48,7 +48,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project: 'optf/osdf' project-name: 'optf-osdf' branch: 'master' @@ -62,7 +62,7 @@ - gerrit-maven-clm nexus-iq-namespace: 'onap-' project: optf/osdf - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g project-name: 'optf-osdf' stream: - 'master': diff --git a/jjb/policy/policy-apex-pdp.yaml b/jjb/policy/policy-apex-pdp.yaml index 1923c765e..42cfd7c6e 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -19,9 +19,9 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true - mvn-params: '-P docker' + mvn-params: '-P docker maven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -35,7 +35,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - project: name: policy-apex-pdp-sonar @@ -47,7 +47,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-8c-8g project: 'policy/apex-pdp' project-name: 'policy-apex-pdp' branch: 'master' diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 534e476e4..4c4c47d66 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -7,13 +7,13 @@ - '{project-name}-{stream}-merge-java': docker-pom: 'pom.xml' mvn-params: '-P docker' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' @@ -29,7 +29,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-api-sonar @@ -41,7 +41,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/api' project-name: 'policy-api' branch: 'master' diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index 1499e006e..006ad3b95 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -20,7 +20,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-common-sonar @@ -32,7 +32,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/common' project-name: 'policy-common' branch: 'master' diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index 661b35198..9cb4ca0b6 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -7,13 +7,13 @@ - '{project-name}-{stream}-merge-java': docker-pom: 'pom.xml' mvn-params: '-P docker' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' @@ -29,7 +29,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-distribution-sonar @@ -41,7 +41,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/distribution' project-name: 'policy-distribution' branch: 'master' diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index d5c9d25b8..61ac6feed 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -8,9 +8,9 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: "-P docker" - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' @@ -25,7 +25,7 @@ mvn-settings: 'policy-docker-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-docker-base-common @@ -37,19 +37,19 @@ docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g pattern: 'do_not_match_any_file' - '{project-name}-{stream}-merge-java': project-name: 'policy-docker-arm64' docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' - build-node: ubuntu1604-docker-arm64-4c-2g + build-node: ubuntu1804-docker-arm64-4c-2g pattern: 'do_not_match_any_file' - '{project-name}-multiarch-{stream}-merge-java' - gerrit-maven-docker-stage: project-name: 'policy-docker-arm64' - build-node: ubuntu1604-docker-arm64-4c-2g + build-node: ubuntu1804-docker-arm64-4c-2g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' container-public-registry: 'docker.io' @@ -60,7 +60,7 @@ pattern: 'do_not_match_any_file' - gerrit-maven-docker-stage: project-name: 'policy-docker-amd64' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' container-public-registry: 'docker.io' @@ -70,7 +70,7 @@ - compare-type: REG_EXP pattern: 'do_not_match_any_file' - '{project-name}-docker-manifest-{stream}': - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - '{project-name}-multiarch-docker-stage-{stream}' # - '{project-name}-gerrit-release-jobs': # build-node: centos7-docker-8c-8g @@ -82,7 +82,7 @@ mvn-settings: 'policy-docker-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-docker-clm diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 7935f3300..d255266f4 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -13,9 +13,9 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true - mvn-params: '-P docker' + mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -29,7 +29,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - project: name: policy-drools-applications-sonar @@ -41,7 +41,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/drools-applications' project-name: 'policy-drools-applications' branch: 'master' @@ -60,7 +60,7 @@ branch: 'master' mvn-settings: 'policy-drools-applications-settings' java-version: openjdk11 - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - project: name: policy-drools-applications-info diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml index 25b45e0fc..6440e3578 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -13,9 +13,9 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true - mvn-params: '-P docker' + mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -29,7 +29,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - project: name: policy-drools-pdp-sonar @@ -41,7 +41,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/drools-pdp' project-name: 'policy-drools-pdp' branch: 'master' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index 0ebc274b8..9f8030a79 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -13,9 +13,9 @@ build-node: centos7-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true - mvn-params: '-P docker' + mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -29,7 +29,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: 'ubuntu1604-docker-8c-8g' + build-node: 'ubuntu1804-docker-8c-8g' - project: name: policy-engine-sonar @@ -41,7 +41,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/engine' project-name: 'policy-engine' branch: 'master' @@ -61,7 +61,7 @@ branch: 'master' mvn-settings: 'policy-engine-settings' java-version: openjdk11 - build-node: 'ubuntu1604-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' - project: name: policy-engine-info diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml index 924ea3786..862c04031 100644 --- a/jjb/policy/policy-gui.yaml +++ b/jjb/policy/policy-gui.yaml @@ -7,19 +7,21 @@ - '{project-name}-{stream}-merge-java': docker-pom: 'pom.xml' mvn-params: '-P docker' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + disabled: true - '{project-name}-gerrit-release-jobs': build-node: centos7-builder-4c-4g + disabled: true project: 'policy/gui' stream: @@ -29,7 +31,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-gui-sonar @@ -41,7 +43,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/gui' project-name: 'policy-gui' branch: 'master' @@ -66,5 +68,6 @@ project-name: policy-gui jobs: - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g project: policy/gui branch: master diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index 8b85b6e9f..0b9e63799 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -20,7 +20,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-models-sonar @@ -32,7 +32,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/models' project-name: 'policy-models' branch: 'master' diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index d5f183efe..75c9e22ea 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -5,52 +5,21 @@ jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java': - project-name: 'policy-pap-amd64' docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' + mvn-params: '-P docker' build-node: ubuntu1804-docker-8c-8g - pattern: 'do_not_match_any_file' - - '{project-name}-{stream}-merge-java': - project-name: 'policy-pap-arm64' - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-P docker -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' - build-node: ubuntu1604-docker-arm64-4c-2g - pattern: 'do_not_match_any_file' - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - - '{project-name}-gerrit-release-jobs': - build-node: centos7-docker-8c-8g - - '{project-name}-multiarch-{stream}-merge-java': - build-node: ubuntu1804-docker-8c-8g - - gerrit-maven-docker-stage: - project-name: 'policy-pap-arm64' - build-node: ubuntu1604-docker-arm64-4c-2g - maven-versions-plugin: true - mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' - container-public-registry: 'docker.io' - container-staging-registry: 'docker.io' - cron: '' - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'do_not_match_any_file' - gerrit-maven-docker-stage: - project-name: 'policy-pap-amd64' - build-node: centos7-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true - mvn-params: '-P docker -Dmaven.test.skip=true -Ddocker.pull.registry=docker.io -Ddocker.push.registry=registry-1.docker.io' - container-public-registry: 'docker.io' - container-staging-registry: 'docker.io' - cron: '' - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'do_not_match_any_file' - - '{project-name}-docker-manifest-{stream}': + mvn-params: '-P docker -Dmaven.test.skip=true' + container-public-registry: 'nexus3.onap.org:10001' + container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g - - '{project-name}-multiarch-docker-stage-{stream}' project: 'policy/pap' stream: @@ -60,7 +29,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-pap-sonar @@ -72,7 +41,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/pap' project-name: 'policy-pap' branch: 'master' diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 013bc3e37..7901d4fd5 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -20,7 +20,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-parent-clm diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 0915bf0e6..a4982aaae 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -7,13 +7,13 @@ - '{project-name}-{stream}-merge-java': docker-pom: 'pom.xml' mvn-params: '-P docker' - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g - gerrit-maven-stage: sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true mvn-params: '-P docker -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' @@ -29,7 +29,7 @@ java-version: openjdk11 files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: policy-xacml-pdp-sonar @@ -41,7 +41,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'policy/xacml-pdp' project-name: 'policy-xacml-pdp' branch: 'master' diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index 7edb47b81..fa76df191 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -14,6 +14,9 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - '{project-name}-{stream}-release-java-daily' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + project: 'portal' stream: - 'master': diff --git a/jjb/sdc/sdc-dcae-d-ci.yaml b/jjb/sdc/sdc-dcae-d-ci.yaml index 735f98ca0..ae024000b 100644 --- a/jjb/sdc/sdc-dcae-d-ci.yaml +++ b/jjb/sdc/sdc-dcae-d-ci.yaml @@ -38,7 +38,7 @@ # docker-pom: 'pom.xml' # mvn-profile: 'docker' # mvn-params: '-DskipTests=true' -# build-node: 'ubuntu1604-docker-arm64-4c-2g' +# build-node: 'ubuntu1804-docker-arm64-4c-2g' # project: 'sdc/dcae-d/ci' # stream: # - 'master': diff --git a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml index 8aa4bf939..eebb04d5f 100644 --- a/jjb/sdc/sdc-dcae-d-dt-be-main.yaml +++ b/jjb/sdc/sdc-dcae-d-dt-be-main.yaml @@ -15,6 +15,8 @@ mvn-params: '-P docker -DskipTests=true' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'sdc/dcae-d/dt-be-main' stream: - 'master': @@ -29,7 +31,7 @@ # project-name: 'sdc-dcae-d-dt-be-main-arm64' # jobs: # - '{project-name}-{stream}-docker-version-java-daily': -# build-node: 'ubuntu1604-docker-arm64-4c-2g' +# build-node: 'ubuntu1804-docker-arm64-4c-2g' # docker-pom: 'pom.xml' # mvn-profile: 'docker' # mvn-params: '-DskipTests=true' @@ -38,7 +40,7 @@ # - 'master': # branch: 'master' # mvn-settings: 'sdc-dcae-d-dt-be-main-settings' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # files: '**' # archive-artifacts: '' # build-timeout: 60 diff --git a/jjb/sdc/sdc-dcae-d-dt.yaml b/jjb/sdc/sdc-dcae-d-dt.yaml index 0d9130358..6531c545a 100644 --- a/jjb/sdc/sdc-dcae-d-dt.yaml +++ b/jjb/sdc/sdc-dcae-d-dt.yaml @@ -2,7 +2,7 @@ - project: name: sdc-dcae-d-dt project-name: 'sdc-dcae-d-dt' - build-node: ubuntu1604-builder-4c-2g + build-node: ubuntu1804-builder-4c-4g jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -16,6 +16,8 @@ mvn-params: '-P server,docker -DskipTests=true' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'sdc/dcae-d/dt' stream: @@ -29,10 +31,10 @@ #- project: # name: sdc-dcae-d-dt-arm64 # project-name: 'sdc-dcae-d-dt-arm64' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # jobs: # - '{project-name}-{stream}-docker-version-java-daily': -# build-node: 'ubuntu1604-docker-arm64-4c-2g' +# build-node: 'ubuntu1804-docker-arm64-4c-2g' # docker-pom: 'pom.xml' # mvn-profile: 'server,docker' # mvn-params: '-DskipTests=true' @@ -71,7 +73,7 @@ nexus-iq-namespace: 'onap-' project: sdc/dcae-d/dt project-name: 'sdc-dcae-d-dt' - build-node: ubuntu1604-builder-4c-2g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'sdc-dcae-d-dt-settings' diff --git a/jjb/sdc/sdc-dcae-d-fe.yaml b/jjb/sdc/sdc-dcae-d-fe.yaml index b156afdfa..f5693cb28 100644 --- a/jjb/sdc/sdc-dcae-d-fe.yaml +++ b/jjb/sdc/sdc-dcae-d-fe.yaml @@ -2,7 +2,7 @@ - project: name: sdc-dcae-d-fe project-name: 'sdc-dcae-d-fe' - build-node: ubuntu1604-builder-4c-2g + build-node: ubuntu1804-builder-4c-4g jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' @@ -16,6 +16,8 @@ mvn-params: '-P docker -DskipTests=true' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'sdc/dcae-d/fe' stream: @@ -31,7 +33,7 @@ # project-name: 'sdc-dcae-d-fe-arm64' # jobs: # - '{project-name}-{stream}-docker-version-java-daily': -# build-node: 'ubuntu1604-docker-arm64-4c-2g' +# build-node: 'ubuntu1804-docker-arm64-4c-2g' # docker-pom: 'pom.xml' # mvn-profile: 'docker' # mvn-params: '-DskipTests=true' @@ -70,7 +72,7 @@ nexus-iq-namespace: 'onap-' project: sdc/dcae-d/fe project-name: 'sdc-dcae-d-fe' - build-node: ubuntu1604-builder-4c-2g + build-node: ubuntu1804-builder-4c-4g branch: 'master' mvn-settings: 'sdc-dcae-d-fe-settings' diff --git a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml index fc0fd4297..54fd89857 100644 --- a/jjb/sdc/sdc-dcae-d-tosca-lab.yaml +++ b/jjb/sdc/sdc-dcae-d-tosca-lab.yaml @@ -20,6 +20,8 @@ mvn-params: '-P default -Dmaven.test.skip=true' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g docker-pom: 'pom.xml' mvn-profile: 'default' @@ -35,7 +37,7 @@ # path: '.' # pattern: '**' # mvn-settings: 'sdc-dcae-d-tosca-lab-settings' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # jobs: # - '{project-name}-{stream}-docker-java-daily': # mvn-params: '-Dmaven.test.skip=true' diff --git a/jjb/sdc/sdc-microservices.yaml b/jjb/sdc/sdc-microservices.yaml index 5fc7242ca..cf843d6f4 100644 --- a/jjb/sdc/sdc-microservices.yaml +++ b/jjb/sdc/sdc-microservices.yaml @@ -16,7 +16,7 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-v1-8c-8g + build-node: ubuntu1804-docker-v1-8c-8g maven-versions-plugin: true mvn-params: '-DskipTests=true' container-public-registry: 'nexus3.onap.org:10001' diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index 6507f4f25..c0d796482 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -5,7 +5,7 @@ project-name: 'sdc-sdc-docker-base' jobs: - '{project-name}-{stream}-verify-java': - build-node: 'ubuntu1604-docker-v1-8c-8g' + build-node: 'ubuntu1804-docker-v1-8c-8g' docker-pom: 'pom.xml' - '{project-name}-{stream}-sdc-merge-java': build-node: 'ubuntu1604-docker-8c-8g' @@ -44,7 +44,7 @@ # mvn-settings: 'sdc-sdc-docker-base-settings' # files: '**' # archive-artifacts: '' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # maven-version: 'mvn35' - project: diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index ca0408a24..b2d42b961 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -28,8 +28,8 @@ stream: - 'master': branch: 'master' - - 'elalto': - branch: 'elalto' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'sdc-sdc-workflow-designer-settings' files: '**' archive-artifacts: '' @@ -53,7 +53,7 @@ # archive-artifacts: '' # docker-pom: 'pom.xml' # mvn-profile: docker -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # maven-version: 'mvn35' # - project: diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 71296e47e..f17fd1a64 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -30,7 +30,7 @@ - '{project-name}-{stream}-verify-java': mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' - '{project-name}-{stream}-sdc-merge-java': - build-node: 'ubuntu1604-docker-v1-8c-8g' + build-node: 'ubuntu1804-docker-v1-8c-8g' docker-pom: 'pom.xml' mvn-profile: 'docker' mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' @@ -41,7 +41,7 @@ maven-versions-plugin: true mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/' - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-v1-8c-8g + 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/' container-public-registry: 'nexus3.onap.org:10001' @@ -53,6 +53,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'sdc-settings' files: '**' archive-artifacts: '' @@ -64,7 +66,7 @@ # project-name: 'sdc-arm64' # jobs: # - '{project-name}-{stream}-docker-version-java-daily': -# build-node: 'ubuntu1604-docker-arm64-4c-2g' +# build-node: 'ubuntu1804-docker-arm64-4c-2g' # docker-pom: 'pom.xml' # mvn-profile: 'docker' # mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus.onap.org/content/repositories/npm/' @@ -80,12 +82,13 @@ - project: name: sdc-sonar jobs: - - gerrit-maven-sonar + - gerrit-maven-sonar: + build-timeout: 120 sonarcloud: true sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" + sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.7.0.1746:sonar" cron: '@daily' build-node: ubuntu1604-builder-8c-8g project: 'sdc' diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 39a89779f..0b04a27f7 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -17,7 +17,7 @@ build-node: centos7-builder-4c-4g cron: '' - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' @@ -30,6 +30,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'sdnc-apps-settings' # due to a strange macro / variable translation problem this needs to be @@ -40,7 +42,7 @@ files: '**' archive-artifacts: '' maven-version: "mvn35" - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -54,7 +56,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdnc/apps' project-name: 'sdnc-apps' branch: 'master' @@ -79,7 +81,7 @@ # mvn-settings: 'sdnc-apps-settings' # files: '**' # archive-artifacts: '' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g - project: name: sdnc-apps-clm @@ -88,7 +90,7 @@ nexus-iq-namespace: 'onap-' project: sdnc/apps project-name: 'sdnc-apps' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 85293ea15..ee7c79dd1 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -17,6 +17,8 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'sdnc-northbound-settings' # due to a strange macro / variable translation problem this needs to be @@ -27,7 +29,7 @@ files: '**' archive-artifacts: '' maven-version: "mvn35" - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -41,7 +43,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'sdnc/northbound' project-name: 'sdnc-northbound' branch: 'master' @@ -57,7 +59,7 @@ nexus-iq-namespace: 'onap-' project: sdnc/northbound project-name: 'sdnc-northbound' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index c39db4017..8cba7aac3 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -13,7 +13,7 @@ maven-versions-plugin: true cron: '' - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' @@ -26,11 +26,13 @@ stream: - 'master': branch: 'master' + - 'frankfurt': + branch: 'frankfurt' mvn-settings: 'sdnc-oam-settings' maven-version: "mvn35" files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g shallow-clone: true mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -51,7 +53,7 @@ # mvn-settings: 'sdnc-oam-settings' # files: '**' # archive-artifacts: '' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g - project: name: sdnc-oam-clm @@ -60,7 +62,7 @@ nexus-iq-namespace: 'onap-' project: sdnc/oam project-name: 'sdnc-oam' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/sdnc/sdnc-oom.yaml b/jjb/sdnc/sdnc-oom.yaml index 1ab686219..ae86ef5bf 100644 --- a/jjb/sdnc/sdnc-oom.yaml +++ b/jjb/sdnc/sdnc-oom.yaml @@ -17,7 +17,7 @@ mvn-settings: 'sdnc-oom-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-helm-2c-1g + build-node: ubuntu1804-helm-2c-1g pre_build_script: !include-raw-escape: shell/helm-repo-init.sh oom_build_script: | #!/bin/bash diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 323bca47d..cb7d0c93a 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -16,9 +16,9 @@ build-node: centos7-builder-4c-4g maven-versions-plugin: true - gerrit-maven-docker-stage: - build-node: ubuntu1604-docker-8c-8g + build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true - mvn-params: '-P docker -Dmaven.test.skip=true' + mvn-params: '-P docker -DskipTests' container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' - '{project-name}-gerrit-release-jobs': @@ -32,7 +32,7 @@ mvn-settings: 'so-settings' files: '**' archive-artifacts: '' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: so-sonar @@ -45,7 +45,7 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' max-git-repo-age-hours: 48 - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'so' project-name: 'so' branch: 'master' @@ -58,12 +58,12 @@ jobs: - 'onap-gerrit-maven-coverity' cron: '@daily' - build-node: 'ubuntu1604-builder-4c-4g' + build-node: 'ubuntu1804-builder-4c-4g' project: 'so' project-name: 'so' branch: 'master' mvn-settings: 'so-settings' - mvn-params: '-Dmaven.test.skip=true' + mvn-params: '-DskipTests' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' coverity-project-name: 'onap-so' coverity-token: 'SrGGJp9T1n1lhJn2sF72XQ' @@ -88,7 +88,7 @@ nexus-iq-namespace: 'onap-' project: so project-name: 'so' - build-node: ubuntu1604-builder-4c-4g + build-node: ubuntu1804-builder-4c-4g stream: - 'master': branch: 'master' diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index df3be1866..7d0eb5d72 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -68,15 +68,19 @@ - 'yaml': tox-dir: '.' tox-envs: 'yaml' - pattern: '**/*.yaml|**/*.yml' + pattern: '**/*.yaml' + - 'yml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yml' - 'json': tox-dir: '.' tox-envs: 'json' pattern: '**/*.json' - - 'robot': - tox-dir: '.' - tox-envs: 'robot' - pattern: '**/*.robot' +# - 'robot': +# tox-dir: '.' +# tox-envs: 'robot' +# pattern: '**/*.robot' stream: - 'master': branch: 'master' diff --git a/jjb/usecases/config-over-netconf.yaml b/jjb/usecases/usecases-csit.yaml index 27491d1ae..69e92f824 100644 --- a/jjb/usecases/config-over-netconf.yaml +++ b/jjb/usecases/usecases-csit.yaml @@ -13,4 +13,7 @@ - 'config-over-netconf': trigger_jobs: - '{project-name}-{stream}-docker-java-shell-daily' + - 'pnf-sw-upgrade': + trigger_jobs: + - '{project-name}-{stream}-docker-java-shell-daily' robot-options: '' diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index a19dcd649..917ff2970 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -18,6 +18,8 @@ - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' docker-pom: 'pom.xml' diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index ee8356b6d..cc1a04b6f 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -23,6 +23,8 @@ - '{project-name}-{stream}-docker-java-daily': mvn-params: '-Dmaven.test.skip=true' build-node: ubuntu1604-docker-8c-8g + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' docker-pom: 'pom.xml' diff --git a/jjb/vid/vid.yaml b/jjb/vid/vid.yaml index cc8ba89f6..871876e75 100644 --- a/jjb/vid/vid.yaml +++ b/jjb/vid/vid.yaml @@ -48,7 +48,7 @@ # mvn-settings: 'vid-settings' # files: '**' # archive-artifacts: '' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # - project: name: vid-sonar diff --git a/jjb/vnfrqts/build-and-upload.yaml b/jjb/vnfrqts/build-and-upload.yaml index 33a21d682..69f158cea 100644 --- a/jjb/vnfrqts/build-and-upload.yaml +++ b/jjb/vnfrqts/build-and-upload.yaml @@ -13,7 +13,7 @@ project-type: freestyle concurrent: true - node: '{build-node}' + node: ubuntu1804-docker-8c-8g properties: - infra-properties: @@ -67,4 +67,4 @@ publishers: - infra-shiplogs: - maven-version: '{maven-version}'
\ No newline at end of file + maven-version: '{maven-version}' diff --git a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml index 8ce93b7ae..291011cab 100644 --- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml +++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml @@ -44,7 +44,7 @@ # - 'master': # branch: 'master' # mvn-settings: 'vnfsdk-dovetail-integration-settings' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # jobs: # - '{project-name}-{stream}-docker-java-daily': # docker-pom: 'pom.xml' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index d94f8cba3..58a45d153 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -51,7 +51,7 @@ # mvn-settings: 'vnfsdk-refrepo-settings' # files: '**' # archive-artifacts: '' -# build-node: ubuntu1604-docker-arm64-4c-2g +# build-node: ubuntu1804-docker-arm64-4c-2g # - project: name: vnfsdk-refrepo-sonar diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index d6a48cd14..f5e7f43c2 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -9,6 +9,8 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g project: 'vnfsdk/validation' stream: - 'master': diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml index c746fbd94..0a8303cab 100644 --- a/jjb/vvp/vvp-test-engine.yaml +++ b/jjb/vvp/vvp-test-engine.yaml @@ -1,6 +1,6 @@ --- - project: - name: vvp-test-engine + name: vvp-test-engine-info project-name: 'vvp-test-engine' project: 'vvp/test-engine' mvn-settings: 'vvp-test-engine-settings' @@ -8,3 +8,37 @@ jobs: - gerrit-info-yaml-verify build-node: centos7-builder-2c-1g + +- project: + name: vvp-test-engine-sonar + jobs: + - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: '{sonar_mvn_goal}' + cron: '@daily' + build-node: ubuntu1804-docker-8c-8g + project: 'vvp/test-engine' + project-name: 'vvp-test-engine' + branch: 'master' + mvn-settings: 'vvp-test-engine-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: vvp-test-engine-verify + project-name: 'vvp-test-engine' + project: 'vvp/test-engine' + stream: + - 'master': + branch: 'master' + mvn-settings: 'vvp-test-engine-settings' + build-node: 'centos7-builder-4c-4g' + subproject: + - 'onap-client': + path: 'onap-client' + pattern: 'onap-client/**' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' |