diff options
224 files changed, 1331 insertions, 2579 deletions
diff --git a/.github/workflows/gerrit-ci-management-novote-verify.yaml b/.github/workflows/gerrit-ci-management-novote-verify.yaml new file mode 100644 index 000000000..84df62071 --- /dev/null +++ b/.github/workflows/gerrit-ci-management-novote-verify.yaml @@ -0,0 +1,70 @@ +--- +name: Gerrit ci-management Verify + +# yamllint disable-line rule:truthy +on: + workflow_dispatch: + inputs: + GERRIT_BRANCH: + description: "Branch that change is against" + required: true + type: string + GERRIT_CHANGE_ID: + description: "The ID for the change" + required: true + type: string + GERRIT_CHANGE_NUMBER: + description: "The Gerrit number" + required: true + type: string + GERRIT_CHANGE_URL: + description: "URL to the change" + required: true + type: string + GERRIT_EVENT_TYPE: + description: "Type of Gerrit event" + required: true + type: string + GERRIT_PATCHSET_NUMBER: + description: "The patch number for the change" + required: true + type: string + GERRIT_PATCHSET_REVISION: + description: "The revision sha" + required: true + type: string + GERRIT_PROJECT: + description: "Project in Gerrit" + required: true + type: string + GERRIT_REFSPEC: + description: "Gerrit refspec of change" + required: true + type: string + +concurrency: + # yamllint disable-line rule:line-length + group: ci-management-${{ github.workflow }}-${{ github.event.inputs.GERRIT_CHANGE_ID || github.run_id }} + cancel-in-progress: true + +permissions: read-all + +jobs: + call-gerrit-ci-management-verify: + # yamllint disable-line rule:line-length + uses: lfit/releng-reusable-workflows/.github/workflows/composed-ci-management-verify.yaml@main + with: + GERRIT_BRANCH: ${{ inputs.GERRIT_BRANCH }} + GERRIT_CHANGE_ID: ${{ inputs.GERRIT_CHANGE_ID }} + GERRIT_CHANGE_NUMBER: ${{ inputs.GERRIT_CHANGE_NUMBER }} + GERRIT_CHANGE_URL: ${{ inputs.GERRIT_CHANGE_URL }} + GERRIT_EVENT_TYPE: ${{ inputs.GERRIT_EVENT_TYPE }} + GERRIT_PATCHSET_NUMBER: ${{ inputs.GERRIT_PATCHSET_NUMBER }} + GERRIT_PATCHSET_REVISION: ${{ inputs.GERRIT_PATCHSET_REVISION }} + GERRIT_PROJECT: ${{ inputs.GERRIT_PROJECT }} + GERRIT_REFSPEC: ${{ inputs.GERRIT_REFSPEC }} + comment-only: "true" + secrets: + GERRIT_SSH_PRIVKEY: ${{ secrets.GERRIT_SSH_PRIVKEY }} + CLOUDS_ENV_B64: ${{ secrets.CLOUDS_ENV_B64 }} + CLOUDS_YAML_B64: ${{ secrets.CLOUDS_YAML_B64 }} diff --git a/.github/workflows/gerrit-ci-management-verify.yaml b/.github/workflows/gerrit-ci-management-verify.yaml index 7213c1f1c..828ba489e 100644 --- a/.github/workflows/gerrit-ci-management-verify.yaml +++ b/.github/workflows/gerrit-ci-management-verify.yaml @@ -45,7 +45,7 @@ on: jobs: call-gerrit-ci-management-verify: # yamllint disable-line rule:line-length - uses: lfit/releng-reusable-workflows/.github/workflows/gerrit-ci-management-verify.yaml@4763193f992b39532dd373a268ed6d6fe11f8b72 + uses: lfit/releng-reusable-workflows/.github/workflows/gerrit-ci-management-verify.yaml@main with: GERRIT_BRANCH: ${{ inputs.GERRIT_BRANCH }} GERRIT_CHANGE_ID: ${{ inputs.GERRIT_CHANGE_ID }} diff --git a/global-jjb b/global-jjb -Subproject cdd11933d0985372daf527d7e54f2a741f62a5f +Subproject 766dbef8a63d824d6e551d4f179806521be95d1 diff --git a/jenkins-config/clouds/openstack/cattle/ubuntu2004-devstack-4c-16g.cfg b/jenkins-config/clouds/openstack/cattle/ubuntu2004-devstack-4c-16g.cfg new file mode 100644 index 000000000..83bc6a81c --- /dev/null +++ b/jenkins-config/clouds/openstack/cattle/ubuntu2004-devstack-4c-16g.cfg @@ -0,0 +1,3 @@ +LABELS=ubuntu2004-devstack-4c-16g +IMAGE_NAME=ZZCI - Ubuntu 20.04 - devstack - x86_64 - 20230913-103335.070 +HARDWARE_ID=v3-standard-4 diff --git a/jenkins-config/managed-config-files/custom/pypirc/content b/jenkins-config/managed-config-files/custom/pypirc/content index 7103c833c..d2fdf1f62 100644 --- a/jenkins-config/managed-config-files/custom/pypirc/content +++ b/jenkins-config/managed-config-files/custom/pypirc/content @@ -4,6 +4,7 @@ index-servers = release pypi-test pypi + pypi-onapsdk [staging] repository: https://nexus3.onap.org/repository/PyPi.staging/ @@ -31,6 +32,6 @@ username: __token__ password: $PYPI_TOKEN [pypi-onapsdk] -repository: https://pypi.org/ +repository: https://upload.pypi.org/legacy/ username: __token__ password: $ONAP_PYPI_TOKEN diff --git a/jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/config-params.yaml new file mode 100644 index 000000000..4465b9c92 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/config-params.yaml @@ -0,0 +1,3 @@ +--- +name: "modeling-yang-kit-settings" +comment: "modeling-yang-kit-settings" diff --git a/jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/content b/jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/content index e830ebdd5..e830ebdd5 120000 --- a/jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/content +++ b/jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/content diff --git a/jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/serverCredentialMappings.sandbox.yaml index 8f9205792..8f9205792 120000 --- a/jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/serverCredentialMappings.sandbox.yaml +++ b/jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/serverCredentialMappings.sandbox.yaml diff --git a/jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/serverCredentialMappings.yaml index aaa81dd92..f2db82c10 100644 --- a/jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/serverCredentialMappings.yaml +++ b/jenkins-config/managed-config-files/mavenSettings/modeling-yang-kit-settings/serverCredentialMappings.yaml @@ -1,7 +1,7 @@ --- serverCredentialMappings: - serverId: "ecomp-snapshots" - credentialsId: &cred "modeling-yangvalidators" + credentialsId: &cred "modeling-yang-kit" - serverId: "ecomp-site" credentialsId: *cred - serverId: "ecomp-staging" diff --git a/jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/config-params.yaml deleted file mode 100644 index e1f7c05e9..000000000 --- a/jenkins-config/managed-config-files/mavenSettings/modeling-yangvalidators-settings/config-params.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -name: "modeling-yangvalidators-settings" -comment: "modeling-yangvalidators-settings" diff --git a/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/config-params.yaml new file mode 100644 index 000000000..0a2d279c7 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/config-params.yaml @@ -0,0 +1,3 @@ +--- +name: "usecase-ui-llm-adaptation-settings" +comment: "usecase-ui-llm-adaptation-settings" diff --git a/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/content b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/content new file mode 120000 index 000000000..e830ebdd5 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/content @@ -0,0 +1 @@ +../../../managed-config-templates/mavenSettings-content
\ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/serverCredentialMappings.sandbox.yaml new file mode 120000 index 000000000..8f9205792 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/serverCredentialMappings.sandbox.yaml @@ -0,0 +1 @@ +../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml
\ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/serverCredentialMappings.yaml new file mode 100644 index 000000000..545f0e616 --- /dev/null +++ b/jenkins-config/managed-config-files/mavenSettings/usecase-ui-llm-adaptation-settings/serverCredentialMappings.yaml @@ -0,0 +1,18 @@ +--- +serverCredentialMappings: + - serverId: "ecomp-snapshots" + credentialsId: &cred "usecase-ui-llm-adaptation" + - serverId: "ecomp-site" + credentialsId: *cred + - serverId: "ecomp-staging" + credentialsId: *cred + - serverId: "nexus3.onap.org:10001" + credentialsId: "read-only-docker" + - serverId: "nexus3.onap.org:10002" + credentialsId: *cred + - serverId: "nexus3.onap.org:10003" + credentialsId: *cred + - serverId: "nexus3.onap.org:10004" + credentialsId: *cred + - serverId: "docker.io" + credentialsId: "onap_dockerhub_creds" diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 280972a68..e39127515 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -44,7 +44,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "aai/aai-common" project-name: "aai-aai-common" @@ -73,19 +72,8 @@ java-version: openjdk8 - project: - name: aai-aai-common-info - project-name: aai-aai-common - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: aai/aai-common - branch: master - -- project: name: "aai-aai-common-docker" jobs: - - gerrit-docker-verify - - gerrit-docker-merge - gerrit-maven-docker-stage: sbom-generator: true mvn-params: "-P docker -Dmaven.test.skip=true" diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index b3b187671..6c50df1e4 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -11,7 +11,6 @@ jobs: - gerrit-maven-verify - gerrit-maven-merge: - cron: "@daily" - gerrit-maven-stage: sign-artifacts: true build-node: centos8-docker-4c-4g @@ -51,7 +50,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "aai/babel" project-name: "aai-babel" @@ -76,12 +74,3 @@ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" java-version: openjdk11 mvn-version: "mvn36" - -- project: - name: aai-babel-info - project-name: aai-babel - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: aai/babel - branch: master diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 14db9ca98..5315e2d0a 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -47,7 +47,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "aai/graphadmin" project-name: "aai-graphadmin" @@ -71,12 +70,3 @@ mvn-settings: "aai-graphadmin-settings" mvn-version: "mvn35" java-version: openjdk8 - -- project: - name: aai-graphadmin-info - project-name: aai-graphadmin - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: aai/graphadmin - branch: master diff --git a/jjb/aai/aai-graphgraph.yaml b/jjb/aai/aai-graphgraph.yaml index dc4477e9c..9c2da70c6 100644 --- a/jjb/aai/aai-graphgraph.yaml +++ b/jjb/aai/aai-graphgraph.yaml @@ -40,7 +40,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "aai/graphgraph" project-name: "aai-graphgraph" @@ -60,12 +59,3 @@ - "master": branch: "master" mvn-settings: "aai-graphgraph-settings" - -- project: - name: aai-graphgraph-info - project-name: aai-graphgraph - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: aai/graphgraph - branch: master diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index 37c0b18e2..44024d2f5 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -38,7 +38,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "aai/logging-service" project-name: "aai-logging-service" @@ -58,12 +57,3 @@ - "master": branch: "master" mvn-settings: "aai-logging-service-settings" - -- project: - name: aai-logging-service-info - project-name: aai-logging-service - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: aai/logging-service - branch: master diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 37cfc609b..deca66156 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -11,7 +11,6 @@ jobs: - gerrit-maven-verify - gerrit-maven-merge: - cron: "@daily" - gerrit-maven-stage: sign-artifacts: true build-node: centos8-docker-4c-4g @@ -50,7 +49,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "aai/model-loader" project-name: "aai-model-loader" @@ -74,12 +72,3 @@ mvn-settings: "aai-model-loader-settings" mvn-version: "mvn36" java-version: openjdk11 - -- project: - name: aai-model-loader-info - project-name: aai-model-loader - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: aai/model-loader - branch: master diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 6487fe8e7..7bb550b23 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -51,7 +51,6 @@ 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: "aai/resources" project-name: "aai-resources" @@ -75,13 +74,3 @@ mvn-settings: "aai-resources-settings" mvn-version: "mvn35" java-version: openjdk8 - -- project: - name: aai-resources-info - project-name: aai-resources - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: aai/resources - branch: master - java-version: openjdk8 diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index fa09beb6b..f17b62d81 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -38,7 +38,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "aai/rest-client" project-name: "aai-rest-client" @@ -58,12 +57,3 @@ - "master": branch: "master" mvn-settings: "aai-rest-client-settings" - -- project: - name: aai-rest-client-info - project-name: aai-rest-client - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: aai/rest-client - branch: master diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index d5515a0f5..91e220d56 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -47,7 +47,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g java-version: openjdk11 project: "aai/schema-service" @@ -71,12 +70,3 @@ branch: "master" mvn-settings: "aai-schema-service-settings" mvn-version: "mvn36" - -- project: - name: aai-schema-service-info - project-name: aai-schema-service - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: aai/schema-service - branch: master diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 97eb3b1bf..d5b182927 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -11,7 +11,6 @@ jobs: - gerrit-maven-verify - gerrit-maven-merge: - cron: "@daily" - gerrit-maven-stage: sign-artifacts: true build-node: centos8-docker-4c-4g @@ -49,7 +48,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "aai/sparky-be" project-name: "aai-sparky-be" @@ -73,12 +71,3 @@ mvn-settings: "aai-sparky-be-settings" mvn-version: "mvn36" java-version: openjdk11 - -- project: - name: aai-sparky-be-info - project-name: aai-sparky-be - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: aai/sparky-be - branch: master diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index 257a6ffdc..110486fb0 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -25,15 +25,6 @@ archive-artifacts: "" - project: - name: aai-sparky-fe-info - project-name: aai-sparky-fe - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: aai/sparky-fe - branch: master - -- project: name: aai-sparky-fe-sonar jobs: - gerrit-maven-sonar @@ -41,7 +32,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "aai/sparky-fe" project-name: "aai-sparky-fe" diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 2817c572c..01493e40c 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -50,7 +50,6 @@ 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: "aai/traversal" project-name: "aai-traversal" @@ -74,12 +73,3 @@ mvn-settings: "aai-traversal-settings" mvn-version: "mvn35" java-version: openjdk8 - -- project: - name: aai-traversal-info - project-name: aai-traversal - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: aai/traversal - branch: master diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 894ed22cc..4b5de2f8f 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -12,7 +12,6 @@ - gerrit-maven-verify: mvn-params: "-Ddocker.skip.push=true -Pdocker" - gerrit-maven-merge: - cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: build-node: centos8-docker-8c-8g @@ -26,7 +25,6 @@ container-staging-registry: "nexus3.onap.org:10003" mvn-params: "-Dmaven.test.skip=true -Pdocker" maven-versions-plugin: true - cron: "@daily" - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g @@ -49,13 +47,12 @@ nexus-snapshot-repo: "snapshots" - project: - name: ccsdk-apps - project-name: "ccsdk-apps-java17" + name: ccsdk-apps-released-java17 + project-name: "ccsdk-apps" jobs: - gerrit-maven-verify: mvn-params: "-Ddocker.skip.push=true -Pdocker" - gerrit-maven-merge: - cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: build-node: centos8-docker-8c-8g @@ -69,7 +66,51 @@ container-staging-registry: "nexus3.onap.org:10003" mvn-params: "-Dmaven.test.skip=true -Pdocker" maven-versions-plugin: true + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "ccsdk/apps" + stream: + - "montreal": + branch: "montreal" + - "london": + branch: "london" + java-version: openjdk17 + mvn-version: "mvn38" + mvn-settings: "ccsdk-apps-settings" + # due to a strange macro / variable translation problem this needs to be + # passed as a string block to properly get the properties correctly defined + # in the job + maven-deploy-properties: | + deployAtEnd=true + files: "**" + archive-artifacts: "" + build-node: centos8-docker-8c-8g + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + +- project: + name: ccsdk-apps-current-java17 + project-name: "ccsdk-apps" + jobs: + - gerrit-maven-verify: + mvn-params: "-Ddocker.skip.push=true -Pdocker" + - gerrit-maven-merge: cron: "@daily" + mvn-params: "-Dmaven.test.skip=true" + - gerrit-maven-stage: + build-node: centos8-docker-8c-8g + sign-artifacts: true + mvn-params: "-Dmaven.test.skip=true" + cron: "" + sbom-generator: true + + - gerrit-maven-docker-stage: + cron: "@daily" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + mvn-params: "-Dmaven.test.skip=true -Pdocker" + maven-versions-plugin: true - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g @@ -77,8 +118,6 @@ stream: - "master": branch: "master" - - "london": - branch: "london" java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "ccsdk-apps-settings" @@ -101,7 +140,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "ccsdk/apps" project-name: "ccsdk-apps" @@ -127,12 +165,3 @@ mvn-settings: "ccsdk-apps-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" build-node: ubuntu1804-builder-4c-4g - -- project: - name: ccsdk-apps-info - project-name: ccsdk-apps - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: ccsdk/apps - branch: master diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index 12657cf9a..3c7d09af7 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -15,6 +15,8 @@ stream: - "master": branch: "master" + - "montreal": + branch: "montreal" - "london": branch: "london" - "kohn": diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index 275123e4e..4f949f456 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -6,7 +6,6 @@ - gerrit-maven-verify: cron: "" - gerrit-maven-merge: - cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: build-node: centos8-docker-8c-8g @@ -21,7 +20,6 @@ container-staging-registry: "nexus3.onap.org:10003" mvn-params: "-Dmaven.test.skip=true -Pdocker" maven-versions-plugin: true - cron: "@daily" - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g project: "ccsdk/oran" @@ -40,13 +38,12 @@ nexus-snapshot-repo: "snapshots" - project: - name: ccsdk-oran-java17 + name: ccsdk-oran-released-java17 project-name: "ccsdk-oran" jobs: - gerrit-maven-verify: cron: "" - gerrit-maven-merge: - cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: build-node: centos8-docker-8c-8g @@ -61,15 +58,53 @@ container-staging-registry: "nexus3.onap.org:10003" mvn-params: "-Dmaven.test.skip=true -Pdocker" maven-versions-plugin: true + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + project: "ccsdk/oran" + stream: + - "montreal": + branch: "montreal" + - "london": + branch: "london" + java-version: openjdk17 + mvn-version: "mvn38" + mvn-settings: "ccsdk-oran-settings" + files: "**" + archive-artifacts: "" + docker-pom: "pom.xml" + mvn-profile: docker + build-node: centos8-docker-8c-8g + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + +- project: + name: ccsdk-oran-current-java17 + project-name: "ccsdk-oran" + jobs: + - gerrit-maven-verify: + cron: "" + - gerrit-maven-merge: cron: "@daily" + mvn-params: "-Dmaven.test.skip=true" + - gerrit-maven-stage: + build-node: centos8-docker-8c-8g + sign-artifacts: true + mvn-params: "-Dmaven.test.skip=true" + mvn-opts: "-Ddocker.skip=true" + cron: "@daily" + sbom-generator: true + - gerrit-maven-docker-stage: + build-node: centos8-docker-8c-8g + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + mvn-params: "-Dmaven.test.skip=true -Pdocker" + maven-versions-plugin: true - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g project: "ccsdk/oran" stream: - "master": branch: "master" - - "london": - branch: "london" java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "ccsdk-oran-settings" @@ -98,14 +133,6 @@ build-node: centos8-builder-4c-4g - project: - name: ccsdk-oran-info - project: ccsdk/oran - project-name: ccsdk-oran - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: ccsdk-oran-sonar jobs: - gerrit-maven-sonar @@ -116,7 +143,6 @@ - compare-type: REG_EXP pattern: "a1-policy-management/.*" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: centos8-docker-8c-8g project: "ccsdk/oran" project-name: "ccsdk-oran" diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index 700b9bdf6..37fdd144b 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -6,7 +6,6 @@ - gerrit-maven-verify: mvn-params: "-Ddocker.skip.push=true -Pdocker" - gerrit-maven-merge: - cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: build-node: centos8-docker-8c-8g @@ -19,7 +18,6 @@ container-staging-registry: "nexus3.onap.org:10003" mvn-params: "-Dmaven.test.skip=true -Pdocker" maven-versions-plugin: true - cron: "@daily" - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g @@ -42,13 +40,12 @@ nexus-snapshot-repo: "snapshots" - project: - name: ccsdk-cds-java17 + name: ccsdk-cds-released-java17 project-name: "ccsdk-cds" jobs: - gerrit-maven-verify: mvn-params: "-Ddocker.skip.push=true -Pdocker" - gerrit-maven-merge: - cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: build-node: centos8-docker-8c-8g @@ -61,7 +58,50 @@ container-staging-registry: "nexus3.onap.org:10003" mvn-params: "-Dmaven.test.skip=true -Pdocker" maven-versions-plugin: true + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "ccsdk/cds" + stream: + - "montreal": + branch: "montreal" + - "london": + branch: "london" + java-version: openjdk17 + mvn-version: "mvn38" + mvn-settings: "ccsdk-cds-settings" + # due to a strange macro / variable translation problem this needs to be + # passed as a string block to properly get the properties correctly defined + # in the job + maven-deploy-properties: | + deployAtEnd=true + files: "**" + archive-artifacts: "" + build-node: centos8-docker-8c-8g + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + +- project: + name: ccsdk-cds-current-java17 + project-name: "ccsdk-cds" + jobs: + - gerrit-maven-verify: + mvn-params: "-Ddocker.skip.push=true -Pdocker" + - gerrit-maven-merge: + cron: "@daily" + mvn-params: "-Dmaven.test.skip=true" + - gerrit-maven-stage: + build-node: centos8-docker-8c-8g + sign-artifacts: true + mvn-params: "-Dmaven.test.skip=true" + cron: "" + sbom-generator: true + - gerrit-maven-docker-stage: cron: "@daily" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + mvn-params: "-Dmaven.test.skip=true -Pdocker" + maven-versions-plugin: true - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g @@ -69,8 +109,6 @@ stream: - "master": branch: "master" - - "london": - branch: "london" java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "ccsdk-cds-settings" @@ -93,7 +131,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: centos8-builder-4c-4g project: "ccsdk/cds" project-name: "ccsdk-cds" @@ -119,12 +156,3 @@ mvn-settings: "ccsdk-cds-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" build-node: centos8-builder-4c-4g - -- project: - name: ccsdk-cds-info - project-name: ccsdk-cds - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: ccsdk/cds - branch: master diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index f2c92eb86..478e61d99 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -6,7 +6,6 @@ - gerrit-maven-verify: cron: "" - gerrit-maven-merge: - cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: build-node: centos8-docker-8c-8g @@ -21,7 +20,6 @@ container-staging-registry: "nexus3.onap.org:10003" mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker" maven-versions-plugin: true - cron: "@daily" - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g @@ -41,13 +39,12 @@ nexus-snapshot-repo: "snapshots" - project: - name: ccsdk-distribution-java17 + name: ccsdk-distribution-released-java17 project-name: "ccsdk-distribution" jobs: - gerrit-maven-verify: cron: "" - gerrit-maven-merge: - cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: build-node: centos8-docker-8c-8g @@ -62,14 +59,13 @@ container-staging-registry: "nexus3.onap.org:10003" mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker" maven-versions-plugin: true - cron: "@daily" - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g project: "ccsdk/distribution" stream: - - "master": - branch: "master" + - "montreal": + branch: "montreal" java-version: openjdk17 - "london": branch: "london" @@ -85,6 +81,47 @@ nexus-snapshot-repo: "snapshots" - project: + name: ccsdk-distribution-current-java17 + project-name: "ccsdk-distribution" + jobs: + - gerrit-maven-verify: + cron: "" + - gerrit-maven-merge: + cron: "@daily" + mvn-params: "-Dmaven.test.skip=true" + - gerrit-maven-stage: + build-node: centos8-docker-8c-8g + sign-artifacts: true + mvn-params: "-Dmaven.test.skip=true" + maven-versions-plugin: true + cron: "" + sbom-generator: true + - gerrit-maven-docker-stage: + cron: "@daily" + build-node: centos8-docker-8c-8g + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker" + maven-versions-plugin: true + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "ccsdk/distribution" + stream: + - "master": + branch: "master" + java-version: openjdk17 + mvn-version: "mvn38" + mvn-settings: "ccsdk-distribution-settings" + files: "**" + archive-artifacts: "" + docker-pom: "pom.xml" + mvn-profile: docker + build-node: centos8-docker-8c-8g + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + +- project: name: ccsdk-distribution-clm jobs: - gerrit-maven-clm @@ -99,12 +136,3 @@ mvn-settings: "ccsdk-distribution-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" build-node: centos8-docker-8c-8g - -- project: - name: ccsdk-distribution-info - project-name: ccsdk-distribution - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: ccsdk/distribution - branch: master diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 72a6410f2..3847cecdf 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -6,7 +6,6 @@ - gerrit-maven-verify: cron: "" - gerrit-maven-merge: - cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: build-node: centos8-docker-8c-8g @@ -37,13 +36,12 @@ nexus-snapshot-repo: "snapshots" - project: - name: ccsdk-features-java17 + name: ccsdk-features-released-java17 project-name: "ccsdk-features" jobs: - gerrit-maven-verify: cron: "" - gerrit-maven-merge: - cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: build-node: centos8-docker-8c-8g @@ -56,8 +54,8 @@ project: "ccsdk/features" stream: - - "master": - branch: "master" + - "montreal": + branch: "montreal" mvn-opts: "-Xmx3072m" - "london": branch: "london" @@ -77,6 +75,43 @@ nexus-snapshot-repo: "snapshots" - project: + name: ccsdk-features-current-java17 + project-name: "ccsdk-features" + jobs: + - gerrit-maven-verify: + cron: "" + - gerrit-maven-merge: + cron: "@daily" + mvn-params: "-Dmaven.test.skip=true" + - gerrit-maven-stage: + build-node: centos8-docker-8c-8g + sign-artifacts: true + mvn-params: "-Dmaven.test.skip=true" + cron: "" + sbom-generator: true + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "ccsdk/features" + stream: + - "master": + branch: "master" + mvn-opts: "-Xmx3072m" + java-version: openjdk17 + mvn-version: "mvn38" + mvn-settings: "ccsdk-features-settings" + # due to a strange macro / variable translation problem this needs to be + # passed as a string block to properly get the properties correctly defined + # in the job + maven-deploy-properties: | + deployAtEnd=true + files: "**" + archive-artifacts: "" + build-node: centos8-builder-4c-4g + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + +- project: name: ccsdk-features-sonar jobs: - gerrit-maven-sonar @@ -84,7 +119,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: centos8-builder-4c-4g project: "ccsdk/features" project-name: "ccsdk-features" @@ -110,12 +144,3 @@ mvn-settings: "ccsdk-features-settings" mvn-opts: "-Xmx3072m --add-opens=java.base/java.util=ALL-UNNAMED" build-node: centos8-builder-4c-4g - -- project: - name: ccsdk-features-info - project-name: ccsdk-features - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: ccsdk/features - branch: master diff --git a/jjb/ccsdk/odl-legacy.yaml b/jjb/ccsdk/odl-legacy.yaml index 1d1962fe1..338e1658b 100644 --- a/jjb/ccsdk/odl-legacy.yaml +++ b/jjb/ccsdk/odl-legacy.yaml @@ -12,7 +12,6 @@ - gerrit-maven-verify: cron: "" - gerrit-maven-merge: - cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: build-node: centos8-docker-8c-8g @@ -27,6 +26,8 @@ stream: - "master": branch: "master" + - "montreal": + branch: "montreal" - "london": branch: "london" java-version: openjdk17 @@ -51,7 +52,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: centos8-builder-4c-4g project: "ccsdk/odl-legacy" project-name: "ccsdk-odl-legacy" @@ -77,12 +77,3 @@ mvn-settings: "ccsdk-odl-legacy-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" build-node: centos8-builder-4c-4g - -- project: - name: ccsdk-odl-legacy-info - project: ccsdk/odl-legacy - project-name: ccsdk-odl-legacy - build-node: centos8-builder-2c-1g - branch: master - jobs: - - gerrit-info-yaml-verify diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 2222358fe..74d71c25d 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -6,7 +6,6 @@ - gerrit-maven-verify: cron: "" - gerrit-maven-merge: - cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: build-node: centos8-docker-8c-8g @@ -35,7 +34,43 @@ archive-artifacts: "" - project: - name: ccsdk-parent-java17 + name: ccsdk-parent-released-java17 + project-name: "ccsdk-parent" + jobs: + - gerrit-maven-verify: + cron: "" + - gerrit-maven-merge: + mvn-params: "-Dmaven.test.skip=true" + - gerrit-maven-stage: + build-node: centos8-docker-8c-8g + sign-artifacts: true + mvn-params: "-Dmaven.test.skip=true" + cron: "" + sbom-generator: true + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + project: "ccsdk/parent" + stream: + - "montreal": + branch: "montreal" + - "london": + branch: "london" + java-version: openjdk17 + mvn-version: "mvn38" + mvn-settings: "ccsdk-parent-settings" + # due to a strange macro / variable translation problem this needs to be + # passed as a string block to properly get the properties correctly defined + # in the job + maven-deploy-properties: | + deployAtEnd=true + files: "**" + archive-artifacts: "" + +- project: + name: ccsdk-parent-current-java17 project-name: "ccsdk-parent" jobs: - gerrit-maven-verify: @@ -67,8 +102,6 @@ mvn-params: "-Dmaven.test.skip=true -Drevision=3.0.0" - "{project-name}-gerrit-release-jobs": mvn-params: "-Drevision=3.0.0" - - "london": - branch: "london" java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "ccsdk-parent-settings" @@ -95,12 +128,3 @@ mvn-settings: "ccsdk-parent-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" build-node: centos8-builder-4c-4g - -- project: - name: ccsdk-parent-info - project-name: ccsdk-parent - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: ccsdk/parent - branch: master diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml index 0b49fda01..f047f101d 100644 --- a/jjb/ccsdk/sli.yaml +++ b/jjb/ccsdk/sli.yaml @@ -6,7 +6,6 @@ - gerrit-maven-verify: cron: "" - gerrit-maven-merge: - cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: build-node: centos8-docker-8c-8g @@ -36,12 +35,49 @@ nexus-snapshot-repo: "snapshots" - project: - name: ccsdk-sli-java17 + name: ccsdk-sli-released-java17 project-name: "ccsdk-sli" jobs: - gerrit-maven-verify: cron: "" - gerrit-maven-merge: + mvn-params: "-Dmaven.test.skip=true" + - gerrit-maven-stage: + build-node: centos8-docker-8c-8g + sign-artifacts: true + mvn-params: "-Dmaven.test.skip=true" + cron: "" + sbom-generator: true + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "ccsdk/sli" + stream: + - "montreal": + branch: "montreal" + - "london": + branch: "london" + java-version: openjdk17 + mvn-version: "mvn38" + mvn-settings: "ccsdk-sli-settings" + # due to a strange macro / variable translation problem this needs to be + # passed as a string block to properly get the properties correctly defined + # in the job + maven-deploy-properties: | + deployAtEnd=true + files: "**" + archive-artifacts: "" + build-node: centos8-builder-4c-4g + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + +- project: + name: ccsdk-sli-current-java17 + project-name: "ccsdk-sli-current" + jobs: + - gerrit-maven-verify: + cron: "" + - gerrit-maven-merge: cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: @@ -57,8 +93,6 @@ stream: - "master": branch: "master" - - "london": - branch: "london" java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "ccsdk-sli-settings" @@ -81,7 +115,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: centos8-builder-4c-4g project: "ccsdk/sli" project-name: "ccsdk-sli" @@ -107,12 +140,3 @@ mvn-settings: "ccsdk-sli-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" build-node: centos8-builder-4c-4g - -- project: - name: ccsdk-sli-info - project-name: ccsdk-sli - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: ccsdk/sli - branch: master diff --git a/jjb/ci-management/ci-management-packer-jobs.yaml b/jjb/ci-management/ci-management-packer-jobs.yaml index 1f772c4da..f4f50cd52 100644 --- a/jjb/ci-management/ci-management-packer-jobs.yaml +++ b/jjb/ci-management/ci-management-packer-jobs.yaml @@ -61,6 +61,7 @@ platforms: - centos-cs-8 + - ubuntu-20.04 templates: devstack update-cloud-image: true diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index ccb03d755..22d91ca89 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -6,24 +6,11 @@ - project-view - project: - name: ci-management-info - project-name: ci-management - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: ci-management - branch: master - -- project: name: ci-management-jobs jobs: - gerrit-jenkins-cfg-verify - gerrit-jenkins-sandbox-cleanup - gerrit-jjb-deploy-job - - gerrit-jjb-merge: - disable-job: true - - gerrit-jjb-verify: - disable-job: true - gerrit-packer-verify project: "ci-management" @@ -36,6 +23,7 @@ # configure the gerrit-jjb-verify job build-node-label-check: true build-node-label-list: "" + packer-cloud-settings: packer-cloud-env-hcl - project: name: builder-openstack diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index 47d29e83c..3b0e09b2f 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -50,7 +50,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "cli" project-name: "cli" @@ -72,15 +71,6 @@ build-node: ubuntu1804-builder-4c-4g - project: - name: cli-info - project-name: cli - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: cli - branch: master - -- project: name: cli-sonar-verify java-version: openjdk11 mvn-version: "mvn36" diff --git a/jjb/cps/cps-cps-tbdmt.yaml b/jjb/cps/cps-cps-tbdmt.yaml index dbc44aaee..d5df8a2df 100644 --- a/jjb/cps/cps-cps-tbdmt.yaml +++ b/jjb/cps/cps-cps-tbdmt.yaml @@ -6,16 +6,8 @@ - project-view - project: - name: cps-tbdmt-info - project: cps/cps-tbdmt - project-name: cps-cps-tbdmt - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: cps-tbdmt-clm - java-version: openjdk11 + java-version: openjdk17 mvn-version: "mvn36" maven-version: "mvn36" jobs: @@ -29,7 +21,7 @@ - project: name: cps-tbdmt - java-version: openjdk11 + java-version: openjdk17 mvn-version: "mvn36" maven-version: "mvn36" project-name: cps-cps-tbdmt @@ -62,7 +54,7 @@ - project: name: cps-tbdmt-sonar - java-version: openjdk11 + java-version: openjdk17 mvn-version: "mvn36" maven-version: "mvn36" jobs: @@ -71,18 +63,16 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: centos8-docker-8c-8g project: "cps/cps-tbdmt" project-name: "cps-cps-tbdmt" branch: "master" mvn-settings: "cps-cps-tbdmt-settings" mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: cps-tbdmt-sonar-verify - java-version: openjdk11 + java-version: openjdk17 mvn-version: "mvn36" maven-version: "mvn36" jobs: @@ -98,4 +88,3 @@ branch: "master" mvn-settings: "cps-cps-tbdmt-settings" mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" diff --git a/jjb/cps/cps-cps-temporal-csit.yaml b/jjb/cps/cps-cps-temporal-csit.yaml deleted file mode 100644 index 4c27b92ca..000000000 --- a/jjb/cps/cps-cps-temporal-csit.yaml +++ /dev/null @@ -1,23 +0,0 @@ ---- -- project: - name: cps-cps-temporal-csit - jobs: - - "{project-name}-review-verification-maven-{stream}": - mvn-goals: clean install - mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push= -Pdocker" - - "{project-name}-merge-verification-maven-{stream}": - mvn-goals: clean install - mvn-params: "-Dmaven.test.skip=true -Ddocker.repository.push= -Pdocker" - project-name: "cps-cps-temporal" - recipients: "toine.siebelink@est.tech" - # project name in gerrit - project: "cps/cps-temporal" - stream: - - "master": - branch: "master" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - mvn-settings: "cps-cps-temporal-settings" - robot-options: "" diff --git a/jjb/cps/cps-cps-temporal.yaml b/jjb/cps/cps-cps-temporal.yaml deleted file mode 100644 index 67962e7ad..000000000 --- a/jjb/cps/cps-cps-temporal.yaml +++ /dev/null @@ -1,105 +0,0 @@ ---- -- project: - name: cps-cps-temporal-project-view - project-name: cps-cps-temporal - views: - - project-view - -- project: - name: cps-cps-temporal-info - project: cps/cps-temporal - project-name: cps-cps-temporal - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: - name: cps-cps-temporal - java-version: openjdk11 - mvn-version: mvn36 - maven-version: mvn36 - project-name: cps-cps-temporal - project: cps/cps-temporal - mvn-snapshot-id: "ecomp-snapshots" - nexus-snapshot-repo: "snapshots" - jobs: - - gerrit-maven-docker-verify: - container-public-registry: nexus3.onap.org:10001 - - gerrit-maven-docker-merge: - container-public-registry: nexus3.onap.org:10001 - container-snapshot-registry: nexus3.onap.org:10003 - - gerrit-maven-docker-stage: - build-node: centos8-docker-8c-8g - maven-versions-plugin: true - mvn-params: -Pdocker - container-public-registry: nexus3.onap.org:10001 - container-staging-registry: nexus3.onap.org:10003 - - "{project-name}-gerrit-release-jobs": - build-node: centos7-docker-2c-1g - stream: - - "master": - branch: master - - "jakarta": - branch: "jakarta" - cron: "" - - "kohn": - branch: "kohn" - cron: "" - mvn-settings: cps-cps-temporal-settings - files: "**" - archive-artifacts: "" - build-node: centos8-docker-8c-8g - -- project: - name: cps-cps-temporal-clm - java-version: openjdk11 - mvn-version: mvn36 - maven-version: mvn36 - jobs: - - gerrit-maven-clm - nexus-iq-namespace: onap- - project: cps/cps-temporal - project-name: cps-cps-temporal - branch: master - mvn-settings: cps-cps-temporal-settings - build-node: centos8-docker-8c-8g - -- project: - name: cps-cps-temporal-sonar - java-version: openjdk11 - mvn-version: mvn36 - maven-version: mvn36 - 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: centos8-docker-8c-8g - project: "cps/cps-temporal" - project-name: "cps-cps-temporal" - branch: "master" - mvn-settings: "cps-cps-temporal-settings" - mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - -- project: - name: cps-cps-temporal-sonar-verify - java-version: openjdk11 - mvn-version: "mvn36" - maven-version: "mvn36" - jobs: - - gerrit-maven-sonar-verify - sonarcloud: true - sonarcloud-project-organization: "{sonarcloud_project_organization}" - sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" - sonarcloud-qualitygate-wait: true - sonar-mvn-goal: "{sonar_mvn_goal}" - build-node: centos8-docker-8c-8g - project: "cps/cps-temporal" - project-name: "cps-cps-temporal" - branch: "master" - mvn-settings: "cps-cps-temporal-settings" - mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" diff --git a/jjb/cps/cps-csit.yaml b/jjb/cps/cps-csit.yaml index d57c0abe6..118b94d25 100644 --- a/jjb/cps/cps-csit.yaml +++ b/jjb/cps/cps-csit.yaml @@ -1,6 +1,9 @@ --- - project: name: cps-csit-java11 + java-version: openjdk11 + mvn-version: "mvn36" + maven-version: "mvn36" jobs: - "{project-name}-review-verification-maven-{stream}": mvn-goals: clean install @@ -14,13 +17,16 @@ # project name in gerrit project: "cps" stream: - - "kohn": - branch: "kohn" + - "london": + branch: "london" mvn-settings: "cps-settings" robot-options: "" branch: "master" - project: name: cps-csit-java17 + java-version: openjdk17 + mvn-version: "mvn36" + maven-version: "mvn36" jobs: - "{project-name}-review-verification-maven-{stream}": mvn-goals: clean install @@ -36,6 +42,8 @@ stream: - "master": branch: "master" + - "montreal": + branch: "montreal" mvn-settings: "cps-settings" robot-options: "" branch: "master" diff --git a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml index f8e55520e..c9238f6cb 100644 --- a/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml +++ b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml @@ -1,6 +1,30 @@ --- - project: - name: cps-ncmp-dmi-plugin-csit + name: cps-ncmp-dmi-plugin-csit-java11 + java-version: openjdk11 + mvn-version: "mvn36" + maven-version: "mvn36" + jobs: + - "{project-name}-review-verification-maven-{stream}": + mvn-goals: clean install + mvn-params: "-Dmaven.test.skip=true -Pdocker" + - "{project-name}-merge-verification-maven-{stream}": + mvn-goals: clean install + mvn-params: "-Dmaven.test.skip=true -Pdocker" + project-name: "cps-ncmp-dmi-plugin" + recipients: "toine.siebelink@est.tech" + # project name in gerrit + project: "cps/ncmp-dmi-plugin" + stream: + - "london": + branch: "london" + mvn-settings: "cps-ncmp-dmi-plugin-settings" + robot-options: "" +- project: + name: cps-ncmp-dmi-plugin-csit-java17 + java-version: openjdk17 + mvn-version: "mvn36" + maven-version: "mvn36" jobs: - "{project-name}-review-verification-maven-{stream}": mvn-goals: clean install @@ -15,9 +39,7 @@ stream: - "master": branch: "master" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" + - "montreal": + branch: "montreal" mvn-settings: "cps-ncmp-dmi-plugin-settings" robot-options: "" diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml index ee12b056b..2895b2a2b 100644 --- a/jjb/cps/cps-ncmp-dmi-plugin.yaml +++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml @@ -6,14 +6,6 @@ - project-view - project: - name: cps-ncmp-dmi-plugin-info - project: cps/ncmp-dmi-plugin - project-name: cps-ncmp-dmi-plugin - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: cps-ncmp-dmi-plugin-java17 java-version: openjdk17 mvn-version: mvn36 @@ -42,8 +34,8 @@ stream: - "master": branch: master - - "london": - branch: "london" + - "montreal": + branch: "montreal" cron: "" mvn-settings: cps-ncmp-dmi-plugin-settings files: "**" @@ -77,8 +69,8 @@ - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g stream: - - "kohn": - branch: "kohn" + - "london": + branch: "london" cron: "" mvn-settings: cps-ncmp-dmi-plugin-settings files: "**" @@ -97,6 +89,7 @@ project-name: cps-ncmp-dmi-plugin branch: master mvn-settings: cps-ncmp-dmi-plugin-settings + mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" build-node: centos8-docker-8c-8g - project: @@ -110,7 +103,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: centos8-docker-8c-8g project: "cps/ncmp-dmi-plugin" project-name: "cps-ncmp-dmi-plugin" diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml index ed84ad5de..a7c385532 100644 --- a/jjb/cps/cps.yaml +++ b/jjb/cps/cps.yaml @@ -6,14 +6,6 @@ - project-view - project: - name: cps-info - project: cps - project-name: cps - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: cps-clm java-version: openjdk17 mvn-version: "mvn36" @@ -25,6 +17,7 @@ project-name: "cps" branch: "master" mvn-settings: "cps-settings" + mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" build-node: centos8-docker-8c-8g - project: @@ -53,9 +46,6 @@ - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g stream: - - "kohn": - branch: "kohn" - cron: "" - "london": branch: "london" cron: "" @@ -92,6 +82,8 @@ stream: - "master": branch: "master" + - "montreal": + branch: "montreal" mvn-settings: "cps-settings" files: "**" archive-artifacts: "" @@ -108,7 +100,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: centos8-docker-8c-8g project: "cps" project-name: "cps" diff --git a/jjb/dcaegen2/dcaegen2-analytics-flink.yaml b/jjb/dcaegen2/dcaegen2-analytics-flink.yaml deleted file mode 100644 index 6b9321cfa..000000000 --- a/jjb/dcaegen2/dcaegen2-analytics-flink.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: dcaegen2-analytics-flink-info - project-name: dcaegen2-analytics-flink - jobs: - - gerrit-info-yaml-verify - 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 817eead0e..283f55b17 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -48,7 +48,6 @@ 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/analytics/tca-gen2" project-name: "dcaegen2-analytics-tca-gen2" @@ -74,13 +73,3 @@ mvn-settings: "dcaegen2-analytics-tca-gen2-settings" mvn-version: "mvn35" maven-version: "mvn35" - -- project: - name: dcaegen2-analytics-tca-gen2-info - java-version: openjdk11 - project-name: dcaegen2-analytics-tca-gen2 - jobs: - - gerrit-info-yaml-verify - 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 deleted file mode 100644 index aa6649543..000000000 --- a/jjb/dcaegen2/dcaegen2-analytics.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: dcaegen2-analytics-info - project-name: dcaegen2-analytics - jobs: - - gerrit-info-yaml-verify - 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 33c1702aa..e19356671 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-datafile.yaml @@ -46,7 +46,6 @@ 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/collectors/datafile" project-name: "dcaegen2-collectors-datafile" @@ -69,12 +68,3 @@ branch: "master" java-version: openjdk11 mvn-settings: "dcaegen2-collectors-datafile-settings" - -- project: - name: dcaegen2-collectors-datafile-info - project-name: dcaegen2-collectors-datafile - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: dcaegen2/collectors/datafile - branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml index fbf007d5d..3e4bcb434 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-hv-ves.yaml @@ -48,7 +48,6 @@ 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/collectors/hv-ves" project-name: "dcaegen2-collectors-hv-ves" @@ -70,12 +69,3 @@ branch: "master" build-node: ubuntu1804-docker-8c-8g mvn-settings: "dcaegen2-collectors-hv-ves-settings" - -- project: - name: dcaegen2-collectors-hv-ves-info - project-name: dcaegen2-collectors-hv-ves - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: dcaegen2/collectors/hv-ves - branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml index 8e4db3c6a..77b705ff7 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-restconf.yaml @@ -46,7 +46,6 @@ 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/collectors/restconf" project-name: "dcaegen2-collectors-restconf" @@ -68,13 +67,3 @@ - "master": branch: "master" mvn-settings: "dcaegen2-collectors-restconf-settings" - -- project: - name: dcaegen2-collectors-restconf-info - project-name: dcaegen2-collectors-restconf - java-version: openjdk11 - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: dcaegen2/collectors/restconf - branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index ee5554050..3f97d3ea0 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -38,7 +38,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "dcaegen2/collectors/snmptrap" project-name: "dcaegen2-collectors-snmptrap" @@ -46,12 +45,3 @@ mvn-settings: "dcaegen2-collectors-snmptrap-settings" mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - -- project: - name: dcaegen2-collectors-snmptrap-info - project-name: dcaegen2-collectors-snmptrap - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: dcaegen2/collectors/snmptrap - branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 22f7f2234..22d038f86 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -50,7 +50,6 @@ 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/collectors/ves" project-name: "dcaegen2-collectors-ves" @@ -72,12 +71,3 @@ - "master": branch: "master" mvn-settings: "dcaegen2-collectors-ves-settings" - -- project: - name: dcaegen2-collectors-ves-info - project-name: dcaegen2-collectors-ves - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: dcaegen2/collectors/ves - branch: master diff --git a/jjb/dcaegen2/dcaegen2-collectors.yaml b/jjb/dcaegen2/dcaegen2-collectors.yaml deleted file mode 100644 index 6c50f2fda..000000000 --- a/jjb/dcaegen2/dcaegen2-collectors.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: dcaegen2-collectors-info - project-name: dcaegen2-collectors - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: dcaegen2/collectors - branch: master diff --git a/jjb/dcaegen2/dcaegen2-deployments.yaml b/jjb/dcaegen2/dcaegen2-deployments.yaml index 0b83a6e88..08d5177da 100644 --- a/jjb/dcaegen2/dcaegen2-deployments.yaml +++ b/jjb/dcaegen2/dcaegen2-deployments.yaml @@ -39,12 +39,3 @@ project-name: "dcaegen2-deployments" branch: "master" mvn-settings: "dcaegen2-deployments-settings" - -- project: - name: dcaegen2-deployments-info - project-name: dcaegen2-deployments - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: dcaegen2/deployments - branch: master diff --git a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml index f226ac889..3a959ce49 100644 --- a/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml +++ b/jjb/dcaegen2/dcaegen2-platform-ves-openapi-manager.yaml @@ -47,7 +47,6 @@ 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/ves-openapi-manager" project-name: "dcaegen2-platform-ves-openapi-manager" @@ -75,11 +74,3 @@ project-name: dcaegen2-platform-ves-openapi-manager views: - project-view - -- project: - name: dcaegen2-platform-ves-openapi-manager-info - project: dcaegen2/platform/ves-openapi-manager - project-name: dcaegen2-platform-ves-openapi-manager - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify diff --git a/jjb/dcaegen2/dcaegen2-platform.yaml b/jjb/dcaegen2/dcaegen2-platform.yaml index fc0a4b9c1..4b565a84b 100644 --- a/jjb/dcaegen2/dcaegen2-platform.yaml +++ b/jjb/dcaegen2/dcaegen2-platform.yaml @@ -1,14 +1,5 @@ --- - project: - name: dcaegen2-platform-info - project-name: dcaegen2-platform - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: dcaegen2/platform - branch: master - -- project: name: dcaegen2-platform-release project-name: dcaegen2-platform mvn-settings: dcaegen2-platform-settings diff --git a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml index 0b091d6a0..a3abbe8a9 100644 --- a/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-datalake-handler.yaml @@ -143,7 +143,6 @@ 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/services" project-name: "dcaegen2-services-datalake-handler" diff --git a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml index 53b6869fe..c44963b0b 100644 --- a/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml +++ b/jjb/dcaegen2/dcaegen2-services-docker-python-subprojects.yaml @@ -71,7 +71,6 @@ - gerrit-tox-sonar: # workaround because gerrit-tox-sonar doesn't support mvn-params/opts sonar-mvn-goal: "-f {src-dir}/pom.xml sonar:sonar" - cron: "@daily" stream: master branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml index e6021065d..2bd610a4f 100644 --- a/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml +++ b/jjb/dcaegen2/dcaegen2-services-heartbeat.yaml @@ -33,7 +33,6 @@ 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/services/heartbeat" project-name: "dcaegen2-services-heartbeat" @@ -52,12 +51,3 @@ project-name: "dcaegen2-services-heartbeat" branch: "master" mvn-settings: "dcaegen2-services-heartbeat-settings" - -- project: - name: dcaegen2-services-heartbeat-info - project-name: dcaegen2-services-heartbeat - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: dcaegen2/services/heartbeat - branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml index dbc88e873..65f6ffa6c 100644 --- a/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml +++ b/jjb/dcaegen2/dcaegen2-services-kpi-computation-ms.yaml @@ -71,7 +71,6 @@ 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/services" project-name: "dcaegen2-services-kpi-computation-ms" diff --git a/jjb/dcaegen2/dcaegen2-services-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-mapper.yaml index 66b3dd281..8d339d264 100644 --- a/jjb/dcaegen2/dcaegen2-services-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-mapper.yaml @@ -44,7 +44,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "dcaegen2/services/mapper" project-name: "dcaegen2-services-mapper" @@ -66,13 +65,3 @@ - "master": branch: "master" mvn-settings: "dcaegen2-services-mapper-settings" - -- project: - name: dcaegen2-services-mapper-info - project-name: dcaegen2-services-mapper - java-version: openjdk11 - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: dcaegen2/services/mapper - branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml index 5a19b82ca..4bb8bf3f7 100644 --- a/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper.yaml @@ -46,7 +46,6 @@ 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/services/pm-mapper" project-name: "dcaegen2-services-pm-mapper" @@ -69,12 +68,3 @@ branch: "master" java-version: openjdk11 mvn-settings: "dcaegen2-services-pm-mapper-settings" - -- project: - name: dcaegen2-services-pm-mapper-info - project-name: dcaegen2-services-pm-mapper - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: dcaegen2/services/pm-mapper - branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-prh.yaml b/jjb/dcaegen2/dcaegen2-services-prh.yaml index 690ce8279..6a664a1d8 100644 --- a/jjb/dcaegen2/dcaegen2-services-prh.yaml +++ b/jjb/dcaegen2/dcaegen2-services-prh.yaml @@ -42,7 +42,6 @@ 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 java-version: openjdk11 project: "dcaegen2/services/prh" @@ -65,12 +64,3 @@ - "master": branch: "master" mvn-settings: "dcaegen2-services-prh-settings" - -- project: - name: dcaegen2-services-prh-info - project-name: dcaegen2-services-prh - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: dcaegen2/services/prh - branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-sdk.yaml b/jjb/dcaegen2/dcaegen2-services-sdk.yaml index f09b7476a..33bf6023d 100644 --- a/jjb/dcaegen2/dcaegen2-services-sdk.yaml +++ b/jjb/dcaegen2/dcaegen2-services-sdk.yaml @@ -54,7 +54,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: centos8-docker-8c-8g project: "dcaegen2/services/sdk" project-name: "dcaegen2-services-sdk" @@ -76,12 +75,3 @@ - "master": branch: "master" mvn-settings: "dcaegen2-services-sdk-settings" - -- project: - name: dcaegen2-services-sdk-info - project-name: dcaegen2-services-sdk - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: dcaegen2/services/sdk - branch: master diff --git a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml index 8b8e86284..00ca31a28 100644 --- a/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml +++ b/jjb/dcaegen2/dcaegen2-services-slice-analysis-ms.yaml @@ -72,7 +72,6 @@ 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/services" project-name: "dcaegen2-services-slice-analysis-ms" diff --git a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml index b92c173fd..d9d0f8649 100644 --- a/jjb/dcaegen2/dcaegen2-services-son-handler.yaml +++ b/jjb/dcaegen2/dcaegen2-services-son-handler.yaml @@ -43,7 +43,6 @@ 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/services/son-handler" project-name: "dcaegen2-services-son-handler" @@ -65,13 +64,3 @@ - "master": branch: "master" mvn-settings: "dcaegen2-services-son-handler-settings" - -- project: - name: dcaegen2-services-son-handler-info - java-version: openjdk11 - project-name: dcaegen2-services-son-handler - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: dcaegen2/services/son-handler - branch: master diff --git a/jjb/dcaegen2/dcaegen2-services.yaml b/jjb/dcaegen2/dcaegen2-services.yaml index 4e0d0f2a8..160c78e2c 100644 --- a/jjb/dcaegen2/dcaegen2-services.yaml +++ b/jjb/dcaegen2/dcaegen2-services.yaml @@ -1,13 +1,5 @@ --- - project: - name: dcaegen2-services-info - project-name: dcaegen2-services - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: dcaegen2/services - branch: master -- project: name: dcaegen2-services-release project-name: dcaegen2-services mvn-settings: dcaegen2-services-settings diff --git a/jjb/dcaegen2/dcaegen2-utils.yaml b/jjb/dcaegen2/dcaegen2-utils.yaml index 4b583e845..f315401d4 100644 --- a/jjb/dcaegen2/dcaegen2-utils.yaml +++ b/jjb/dcaegen2/dcaegen2-utils.yaml @@ -36,7 +36,6 @@ 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/utils" project-name: "dcaegen2-utils" @@ -56,15 +55,6 @@ branch: "master" mvn-settings: "dcaegen2-utils-settings" -- project: - name: dcaegen2-utils-info - project-name: dcaegen2-utils - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: dcaegen2/utils - branch: master - - _cbs_client_pypi_common: &cbs_client_pypi_common name: cbs-client-pypi-common # jenkins job prefix diff --git a/jjb/dcaegen2/dcaegen2.yaml b/jjb/dcaegen2/dcaegen2.yaml index dfd1f02f5..fb3b6dccf 100644 --- a/jjb/dcaegen2/dcaegen2.yaml +++ b/jjb/dcaegen2/dcaegen2.yaml @@ -41,12 +41,3 @@ project-name: "dcaegen2" branch: "master" mvn-settings: "dcaegen2-settings" - -- project: - name: dcaegen2-info - project-name: dcaegen2 - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: dcaegen2 - branch: master diff --git a/jjb/demo/demo.yaml b/jjb/demo/demo.yaml index 04e0a16dd..400c08227 100644 --- a/jjb/demo/demo.yaml +++ b/jjb/demo/demo.yaml @@ -34,7 +34,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "demo" project-name: "demo" @@ -44,15 +43,6 @@ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: - name: demo-info - project-name: demo - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: demo - branch: master - -- project: name: demo-linters project: "demo" project-name: "demo" diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml deleted file mode 100644 index a661b4a1e..000000000 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ /dev/null @@ -1,86 +0,0 @@ ---- -- project: - name: dmaap-project-view - project-name: dmaap - views: - - project-view - -- project: - name: dmaap-buscontroller-java - project-name: "dmaap-buscontroller" - jobs: - - "{project-name}-{stream}-verify-java" - - "{project-name}-{stream}-merge-java" - - gerrit-maven-docker-stage: - build-node: ubuntu1804-docker-8c-8g - mvn-goals: "clean package -P docker docker:build docker:push -DskipTests=true" - container-public-registry: "nexus3.onap.org:10001" - container-staging-registry: "nexus3.onap.org:10003" - cron: "" - - "{project-name}-gerrit-release-jobs": - build-node: centos7-docker-2c-1g - project: "dmaap/buscontroller" - stream: - - "master": - branch: "master" - - "london": - branch: "london" - mvn-settings: "dmaap-buscontroller-settings" - files: "**" - archive-artifacts: "" - java-version: openjdk11 - -- project: - name: dmaap-buscontroller-csit - jobs: - - "{project-name}-review-verification-maven-{stream}": - mvn-goals: clean install - mvn-params: "-P docker -DskipTests=true" - - "{project-name}-merge-verification-maven-{stream}": - mvn-goals: clean install - mvn-params: "-P docker -DskipTests=true" - project-name: "dmaap-buscontroller" - recipients: "fiachra.corcoran@est.tech" - project: "dmaap/buscontroller" - stream: - - "master": - branch: "master" - mvn-settings: "dmaap-buscontroller-settings" - robot-options: "" - -- project: - name: dmaap-buscontroller-sonar - jobs: - - gerrit-maven-sonar - sonarcloud: true - sonarcloud-project-organization: "{sonarcloud_project_organization}" - sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" - sonar-mvn-goal: "{sonar_mvn_goal}" - build-node: ubuntu1804-builder-4c-4g - project: "dmaap/buscontroller" - project-name: "dmaap-buscontroller" - branch: "master" - mvn-settings: "dmaap-buscontroller-settings" - mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - java-version: openjdk11 - -- project: - name: dmaap-buscontroller-clm - jobs: - - gerrit-maven-clm - nexus-iq-namespace: "onap-" - project: dmaap/buscontroller - project-name: "dmaap-buscontroller" - branch: "master" - mvn-settings: "dmaap-buscontroller-settings" - java-version: openjdk11 - -- project: - name: dmaap-buscontroller-info - project-name: dmaap-buscontroller - jobs: - - gerrit-info-yaml-verify - 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 e4946ada1..fd821b1bf 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -93,12 +93,3 @@ java-version: openjdk17 mvn-version: "mvn36" maven-version: "mvn36" - -- project: - name: dmaap-datarouter-info - project-name: dmaap-datarouter - jobs: - - gerrit-info-yaml-verify - 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 bc7a57831..6c07340de 100644 --- a/jjb/dmaap/dmaap-kafka-client.yaml +++ b/jjb/dmaap/dmaap-kafka-client.yaml @@ -48,12 +48,3 @@ branch: "master" mvn-settings: "dmaap-kafka11aaf-settings" java-version: openjdk11 - -- project: - name: dmaap-kafka-client-info - project-name: dmaap-kafka-client - jobs: - - gerrit-info-yaml-verify - 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 6eee793d1..7c9d9d626 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -50,12 +50,3 @@ branch: "master" mvn-settings: "dmaap-messagerouter-dmaapclient-settings" java-version: openjdk11 - -- project: - name: dmaap-messagerouter-dmaapclient-info - project-name: dmaap-messagerouter-dmaapclient - jobs: - - gerrit-info-yaml-verify - 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 934b0a84a..4ff27477a 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -74,12 +74,3 @@ branch: "master" mvn-settings: "dmaap-messagerouter-messageservice-settings" java-version: openjdk11 - -- project: - name: dmaap-messagerouter-messageservice-info - project-name: dmaap-messagerouter-messageservice - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: dmaap/messagerouter/messageservice - branch: master diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml index 856d01750..ade4e7c78 100644 --- a/jjb/doc/doc.yaml +++ b/jjb/doc/doc.yaml @@ -4,12 +4,3 @@ project-name: doc views: - project-view - -- project: - name: doc-info - project-name: doc - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: doc - branch: master diff --git a/jjb/doc/rules.yaml b/jjb/doc/rules.yaml deleted file mode 100644 index b78c5aa46..000000000 --- a/jjb/doc/rules.yaml +++ /dev/null @@ -1,218 +0,0 @@ ---- -- 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: - # yamllint disable rule:line-length - - shell: | - #!/bin/bash - . /lib/lsb/init-functions || exit 0 - exitstatus="0" - warning="0" - # message, begin - log_success_msg "INFO doc-rules Version 23-07-07-A" - log_success_msg "INFO Starting additional checks related to documentation." - log_success_msg "INFO See https://git.onap.org/doc/doc-best-practice for example config files (master branch)." - log_success_msg "INFO Modify example config files if you like to use them in a release branch." - log_success_msg "INFO See https://wiki.onap.org/x/w4IEBw for the detailed procedure #02." - log_success_msg "INFO In case of questions please contact the ONAP documentation team." - # docs directory - if [ ! -d docs ] ; then - log_success_msg "INFO Directory docs not found. Skipping further checks." - exit 0 - fi - # config files, required - for i in docs/index.rst docs/conf.py docs/requirements-docs.txt docs/_static/css/ribbon.css .readthedocs.yaml; do - if [ ! -f $i ] ; then - log_failure_msg "FAIL $i missing. Please add it or remove the full docs directory." - exitstatus="1" - else - log_success_msg "INFO $i found." - fi - done - # config files, no longer required - for i in docs/conf.yaml; do - if [ -f $i ] ; then - log_failure_msg "FAIL $i found. It is no longer required. Please remove it." - exitstatus="1" - else - log_success_msg "INFO $i not found." - fi - done - # tox.ini @ docs directory - filename="docs/tox.ini" - if [ ! -f $filename ] ; then - log_failure_msg "FAIL $filename missing. Please add it or remove the full docs directory." - exitstatus="1" - else - log_success_msg "INFO $filename found." - # sphinx-build command and -W option - 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 "INFO sphinx-build option '-W' used in $filename, line $linenumber." - elif echo $line | grep -q ' \-b spelling ' ; then - log_warning_msg "WARN sphinx-build option '-W' missing for spellcheck in $filename, line $linenumber." - warning="1" - else - log_warning_msg "WARN sphinx-build option '-W' missing in $filename, line $linenumber. Please add it." - warning="1" - #log_failure_msg "FAIL sphinx-build option '-W' missing in $filename, line $linenumber. Please add it." - #exitstatus="1" - fi - fi - done < $filename - if [ "$sphinxbuild_detected" = "0" ]; then - log_warning_msg "WARN Sphinx-build command(s) missing in $filename. Please add it." - warning="1" - #log_failure_msg "FAIL Sphinx-build command(s) missing in $filename. Please add it." - #exitstatus="1" - fi - # second tox.ini @ root directory - if [ -f ./tox.ini ] ; then - # sphinx-build command - if cat ./tox.ini | grep -q '^[ \t]*sphinx-build.*' ; then - log_warning_msg "WARN tox.ini also exists in root directory and contains sphinx-build command(s). Please check for redundancies." - warning="1" - fi - fi - unset sphinxbuild_detected - unset linenumber - fi - unset filename - # ribbon.css - filename="docs/_static/css/ribbon.css" - if [ ! -f $filename ]; then - log_failure_msg "FAIL $filename missing. Please add it or remove the full docs directory." - exitstatus="1" - else - log_success_msg "INFO $filename found." - # max-width parameter - cssmaxwidth=$(grep '^[ \t]*max-width:' $filename | sed -e 's/^[ \t]*//' | sed -e 's/;$//'); - if [[ ! $cssmaxwidth == *"max-width: 800px"* ]]; then - log_failure_msg "FAIL Setting 'max-width: 800px' missing in $filename. Please add it." - exitstatus="1" - else - log_success_msg "INFO Setting 'max-width: 800px' found in $filename." - fi - unset cssmaxwidth - fi - unset filename - # readthedocs.yaml - filename=".readthedocs.yaml" - if [ ! -f $filename ]; then - log_failure_msg "FAIL $filename missing. Please add it or remove the full docs directory." - exitstatus="1" - else - log_success_msg "INFO $filename found." - # obsolete parameter: (build:) image: latest - buildimage=$(grep '^[ \t]*image:' $filename | sed -e 's/^[ \t]*//' | sed -e 's/;$//'); - if [[ $buildimage == *"latest"* ]]; then - log_failure_msg "FAIL Setting '(build: image:) latest' found in $filename. Please remove it." - exitstatus="1" - else - log_success_msg "INFO Setting '(build: image:) latest' not found in $filename." - fi - unset buildimage - # obsolete parameter: (python:) version: 3.7 - pythonversion=$(grep '^[ \t]*version:' $filename | sed -e 's/^[ \t]*//' | sed -e 's/;$//'); - if [[ $pythonversion == *"3.7"* ]]; then - log_failure_msg "FAIL Setting '(python:) version: 3.7' found in $filename. Please remove it." - exitstatus="1" - else - log_success_msg "INFO Setting '(python:) version: 3.7' not found in $filename." - fi - unset pythonversion - # obsolete parameter: submodules: - submodules=$(grep '^[ \t]*submodules:' $filename | sed -e 's/^[ \t]*//' | sed -e 's/;$//'); - if [[ $submodules == *"submodules:"* ]]; then - log_failure_msg "FAIL Setting 'submodules:' found in $filename. Please remove it." - exitstatus="1" - else - log_success_msg "INFO Setting 'submodules:' not found in $filename." - fi - unset submodules - # required parameter: (build:) os: - buildos=$(grep '^[ \t]*os:' $filename | sed -e 's/^[ \t]*//' | sed -e 's/;$//'); - if [[ ! $buildos == *"ubuntu-20.04"* ]]; then - log_failure_msg "FAIL Setting '(build:) os: ubuntu-20.04' missing in $filename. Please add it." - exitstatus="1" - else - log_success_msg "INFO Setting '(build:) os: ubuntu-20.04' found in $filename." - fi - unset buildos - # required parameter: (build: tools:) python - buildtoolspython=$(grep '^[ \t]*python:' $filename | sed -e 's/^[ \t]*//' | sed -e 's/;$//'); - if [[ ! $buildtoolspython == *\"3.8\"* ]]; then - log_failure_msg "FAIL Setting '(build: tools:) python: \"3.8\"' missing in $filename. Please add it." - exitstatus="1" - else - log_success_msg "INFO Setting '(build: tools:) python: \"3.8\"' found in $filename." - fi - unset buildtoolspython - fi - unset filename - # message, end - if [ "$exitstatus" = "0" ]; then - if [ "$warning" = "0" ]; then - log_success_msg "INFO Congratulations! No documentation problem(s) detected." - else - log_warning_msg "WARN No major documentation problem(s) detected but there are warnings!" - fi - else - if [ ! "$warning" = "0" ]; then - log_warning_msg "WARN Please check the detected documentation warning(s)!" - fi - log_failure_msg "FAIL Please fix the detected documentation problem(s)!" - fi - exit $exitstatus - # yamllint enable - -- 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 61e528022..2aae718b9 100644 --- a/jjb/externalapi/externalapi-nbi.yaml +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -55,7 +55,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "externalapi/nbi" project-name: "externalapi-nbi" @@ -65,12 +64,3 @@ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" java-version: openjdk11 sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh - -- project: - name: externalapi-nbi-info - project-name: externalapi-nbi - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: externalapi/nbi - branch: master diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index 65306bd8a..6a1501100 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -48,6 +48,9 @@ archive-artifacts: "" + # Default branch value + branch: master + # Set default maven version used for everything maven-version: "mvn33" diff --git a/jjb/global-templates-c.yaml b/jjb/global-templates-c.yaml index 7e25869b4..9cccda452 100644 --- a/jjb/global-templates-c.yaml +++ b/jjb/global-templates-c.yaml @@ -88,7 +88,6 @@ triggers: # 12 AM UTC - - timed: "@daily" - gerrit-trigger-release-manually: server: "{server-name}" project: "{project}" diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml index 96435034f..29b19d9cb 100644 --- a/jjb/global-templates-golang.yaml +++ b/jjb/global-templates-golang.yaml @@ -180,7 +180,6 @@ triggers: # 12 AM UTC - - timed: "@daily" - gerrit-trigger-release-manually: server: "{server-name}" project: "{project}" diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 155a46ad2..3838aca4d 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -128,7 +128,6 @@ <<: *verify_java_defaults name: "{project-name}-{stream}-integration-pairwise" triggers: - - timed: "@daily" - gerrit-trigger-patch-submitted: server: "{server-name}" project: "{project}" @@ -175,7 +174,6 @@ build-timeout: "{build-timeout}" triggers: # 11 AM UTC - - timed: "@daily" - gerrit-trigger-release-manually: server: "{server-name}" project: "{project}" @@ -251,7 +249,6 @@ triggers: # 11 AM UTC - - timed: "@daily" - gerrit-trigger-release-manually: server: "{server-name}" project: "{project}" @@ -477,7 +474,6 @@ triggers: # 12 AM UTC - - timed: "@daily" - gerrit-trigger-release-manually: server: "{server-name}" project: "{project}" @@ -563,7 +559,6 @@ triggers: # 12 AM UTC - - timed: "@daily" - gerrit-trigger-release-manually: server: "{server-name}" project: "{project}" @@ -630,7 +625,6 @@ triggers: # 12 AM UTC - - timed: "@daily" - gerrit-trigger-release-manually: server: "{server-name}" project: "{project}" @@ -699,7 +693,6 @@ triggers: # 12 AM UTC - - timed: "@daily" - gerrit-trigger-release-manually: server: "{server-name}" project: "{project}" @@ -776,7 +769,6 @@ triggers: # 12 AM UTC - - timed: "@daily" - gerrit-trigger-release-manually: server: "{server-name}" project: "{project}" @@ -856,7 +848,6 @@ triggers: # 12 AM UTC - - timed: "@daily" - gerrit-trigger-release-manually: server: "{server-name}" project: "{project}" @@ -954,7 +945,6 @@ triggers: # 12 AM UTC - - timed: "@daily" - gerrit-trigger-release-manually: server: "{server-name}" project: "{project}" diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index c62c99cb2..e1be550bc 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -15,11 +15,11 @@ sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - java-version: openjdk11 + java-version: openjdk17 sbom-generator: true - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - java-version: openjdk11 + java-version: openjdk17 project: "holmes/common" stream: - "master": @@ -28,7 +28,7 @@ files: "**" archive-artifacts: "" build-node: ubuntu1804-builder-4c-4g - java-version: openjdk11 + java-version: openjdk17 - project: name: holmes-common-sonar @@ -38,7 +38,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "holmes/common" project-name: "holmes-common" @@ -46,7 +45,7 @@ mvn-settings: "holmes-common-settings" mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - java-version: openjdk11 + java-version: openjdk17 - project: name: holmes-common-clm @@ -57,13 +56,4 @@ project-name: "holmes-common" branch: "master" mvn-settings: "holmes-common-settings" - java-version: openjdk11 - -- project: - name: holmes-common-info - project-name: holmes-common - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: holmes/common - branch: master + java-version: openjdk17 diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index bb046212c..15f582b50 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -9,15 +9,15 @@ sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - java-version: openjdk11 + java-version: openjdk17 sbom-generator: true - "{project-name}-{stream}-docker-java-daily": mvn-params: "-Dmaven.test.skip=true" build-node: ubuntu1804-docker-8c-8g - java-version: openjdk11 + java-version: openjdk17 - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - java-version: openjdk11 + java-version: openjdk17 project: "holmes/engine-management" stream: - "master": @@ -28,7 +28,7 @@ docker-pom: "pom.xml" mvn-profile: docker build-node: ubuntu1804-builder-4c-4g - java-version: openjdk11 + java-version: openjdk17 - project: name: holmes-engine-management-sonar @@ -38,7 +38,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "holmes/engine-management" project-name: "holmes-engine-management" @@ -46,7 +45,7 @@ mvn-settings: "holmes-engine-management-settings" mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - java-version: openjdk11 + java-version: openjdk17 - project: name: holmes-engine-management-clm @@ -57,13 +56,4 @@ project-name: "holmes-engine-management" branch: "master" mvn-settings: "holmes-engine-management-settings" - java-version: openjdk11 - -- project: - name: holmes-engine-management-info - project-name: holmes-engine-management - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: holmes/engine-management - branch: master + java-version: openjdk17 diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index ff7072889..2f71669f5 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -9,15 +9,15 @@ sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true - java-version: openjdk11 + java-version: openjdk17 sbom-generator: true - "{project-name}-{stream}-docker-java-daily": mvn-params: "-Dmaven.test.skip=true" build-node: ubuntu1804-docker-8c-8g - java-version: openjdk11 + java-version: openjdk17 - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - java-version: openjdk11 + java-version: openjdk17 project: "holmes/rule-management" stream: - "master": @@ -28,7 +28,7 @@ docker-pom: "pom.xml" mvn-profile: docker build-node: ubuntu1804-builder-4c-4g - java-version: openjdk11 + java-version: openjdk17 - project: name: holmes-rule-management-sonar @@ -38,7 +38,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "holmes/rule-management" project-name: "holmes-rule-management" @@ -46,7 +45,7 @@ mvn-settings: "holmes-rule-management-settings" mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - java-version: openjdk11 + java-version: openjdk17 - project: name: holmes-rule-management-clm @@ -57,13 +56,4 @@ project-name: "holmes-rule-management" branch: "master" mvn-settings: "holmes-rule-management-settings" - java-version: openjdk11 - -- project: - name: holmes-rule-management-info - project-name: holmes-rule-management - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: holmes/rule-management - branch: master + java-version: openjdk17 diff --git a/jjb/integration/docker/integration-docker-onap-java11.yaml b/jjb/integration/docker/integration-docker-onap-java11.yaml index 3a326485e..fc4e77f39 100644 --- a/jjb/integration/docker/integration-docker-onap-java11.yaml +++ b/jjb/integration/docker/integration-docker-onap-java11.yaml @@ -1,14 +1,5 @@ --- - project: - name: integration-docker-onap-java-info - project-name: integration-docker-onap-java - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: integration/docker/onap-java11 - branch: master - -- project: name: integration-docker-onap-java-linters project: integration/docker/onap-java11 project-name: integration-docker-onap-java diff --git a/jjb/integration/docker/integration-docker-onap-python.yaml b/jjb/integration/docker/integration-docker-onap-python.yaml index dc7c2ffcb..e60d782de 100644 --- a/jjb/integration/docker/integration-docker-onap-python.yaml +++ b/jjb/integration/docker/integration-docker-onap-python.yaml @@ -1,14 +1,5 @@ --- - project: - name: integration-docker-onap-python-info - project-name: integration-docker-onap-python - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: integration/docker/onap-python - branch: master - -- project: name: integration-docker-onap-python-linters project: integration/docker/onap-python project-name: integration-docker-onap-python diff --git a/jjb/integration/integration-csit.yaml b/jjb/integration/integration-csit.yaml index d401281f1..064b580dd 100644 --- a/jjb/integration/integration-csit.yaml +++ b/jjb/integration/integration-csit.yaml @@ -15,12 +15,3 @@ - "vCPE": trigger_jobs: robot-options: "" - -- project: - name: integration-csit-info - project-name: integration-csit - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: integration/csit - branch: master diff --git a/jjb/integration/integration-data-provider.yaml b/jjb/integration/integration-data-provider.yaml index 3c02f4e17..1f59cba4f 100644 --- a/jjb/integration/integration-data-provider.yaml +++ b/jjb/integration/integration-data-provider.yaml @@ -6,14 +6,6 @@ - project-view - project: - name: integration-data-provider-info - project: integration/data-provider - project-name: integration-data-provider - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: integration-data-provider-linters project: "integration/data-provider" project-name: "integration-data-provider" diff --git a/jjb/integration/integration-docker.yaml b/jjb/integration/integration-docker.yaml index ef37ec78e..907fea1f8 100644 --- a/jjb/integration/integration-docker.yaml +++ b/jjb/integration/integration-docker.yaml @@ -76,3 +76,29 @@ jobs: - gerrit-docker-verify - gerrit-docker-merge + +- project: + name: integration-k8s-toolbox + project: integration + stream: + - "master": + branch: "master" + # Required by verifier + mvn-settings: "integration-settings" + project-name: "integration-k8s-toolbox" + gerrit_trigger_file_paths: + - compare-type: REG_EXP + pattern: "pipelines/docker-onap-k8s-toolbox/.*" + docker-name: "onap/k8s-toolbox" + docker-root: pipelines/docker-onap-k8s-toolbox + container-tag-method: yaml-file + post_docker_build_script: | + #!/bin/bash + set -eux + cd "$DOCKER_ROOT" + docker tag "$CONTAINER_PUSH_REGISTRY/$DOCKER_NAME:$DOCKER_IMAGE_TAG" onap-k8s-toolbox:latest + build-node: ubuntu1804-docker-8c-8g + build-timeout: 20 + jobs: + - gerrit-docker-verify + - gerrit-docker-merge diff --git a/jjb/integration/integration-ietf-actn-tools.yaml b/jjb/integration/integration-ietf-actn-tools.yaml index 62d230336..af7dc2fda 100644 --- a/jjb/integration/integration-ietf-actn-tools.yaml +++ b/jjb/integration/integration-ietf-actn-tools.yaml @@ -6,14 +6,6 @@ - project-view - project: - name: integration-ietf-actn-tools-info - project: integration/ietf-actn-tools - project-name: integration-ietf-actn-tools - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: integration-ietf-actn-tools-linters project: integration/ietf-actn-tools project-name: integration-ietf-actn-tools diff --git a/jjb/integration/integration-python-onapsdk.yaml b/jjb/integration/integration-python-onapsdk.yaml index b140bc11d..4f89fb922 100644 --- a/jjb/integration/integration-python-onapsdk.yaml +++ b/jjb/integration/integration-python-onapsdk.yaml @@ -11,10 +11,6 @@ - "master": branch: "master" subproject: - - "python3.7": - tox-dir: "." - tox-envs: "py37" - pattern: "**/*.py" - "python3.8": tox-dir: "." tox-envs: "py38" @@ -52,14 +48,6 @@ - project-view - project: - name: integration-python-onapsdk-info - project: integration/python-onapsdk - project-name: integration-python-onapsdk - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: integration-python-onapsdk-pypi-build project: integration/python-onapsdk project-name: integration-python-onapsdk @@ -68,6 +56,7 @@ branch: "master" jobs: - gerrit-pypi-verify + - gerrit-pypi-stage - gerrit-pypi-merge - project: diff --git a/jjb/integration/integration-seccom.yaml b/jjb/integration/integration-seccom.yaml index d3f329dff..a4d110cbf 100644 --- a/jjb/integration/integration-seccom.yaml +++ b/jjb/integration/integration-seccom.yaml @@ -1,14 +1,5 @@ --- - project: - name: integration-seccom-info - project-name: integration-seccom - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: integration/seccom - branch: master - -- project: name: integration-seccom-linters project: integration/seccom project-name: integration-seccom diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml index ae6f9f558..ba10fddae 100644 --- a/jjb/integration/integration-templates-csit.yaml +++ b/jjb/integration/integration-templates-csit.yaml @@ -106,7 +106,6 @@ project: "integration/csit" branch: "{branch}" files: "*/{project-name}/**" - - timed: "@daily" - reverse: jobs: "{obj:trigger_jobs}" diff --git a/jjb/integration/integration.yaml b/jjb/integration/integration.yaml index 9d289a4d8..1c0835e85 100644 --- a/jjb/integration/integration.yaml +++ b/jjb/integration/integration.yaml @@ -6,15 +6,6 @@ - project-view - project: - name: integration-info - project-name: integration - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: integration - branch: master - -- project: name: integration-verify-python project-name: integration project: integration diff --git a/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml index 527cead3e..f35028c94 100644 --- a/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml +++ b/jjb/integration/simulators/integration-5G-core-nf-simulator.yaml @@ -1,14 +1,5 @@ --- - project: - name: integration-5G-core-nf-simulator-info - project-name: integration-5G-core-nf-simulator - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: integration/simulators/5G-core-nf-simulator - branch: master - -- project: name: integration-5G-core-nf-simulator project-name: integration-5G-core-nf-simulator project: integration/simulators/5G-core-nf-simulator diff --git a/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml index 7fe573362..b6dca75e7 100644 --- a/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml +++ b/jjb/integration/simulators/integration-A1-policy-enforcement-simulator.yaml @@ -1,13 +1,5 @@ --- - project: - name: integration-simulators-A1-policy-enforcement-simulator-info - project: integration/simulators/A1-policy-enforcement-simulator - project-name: integration-simulators-A1-policy-enforcement-simulator - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: integration-simulators-A1-policy-enforcement-simulator project: integration/simulators/A1-policy-enforcement-simulator project-name: integration-simulators-A1-policy-enforcement-simulator diff --git a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml index fe5d97ab5..63ce6218c 100644 --- a/jjb/integration/simulators/integration-core-nssmf-simulator.yaml +++ b/jjb/integration/simulators/integration-core-nssmf-simulator.yaml @@ -1,13 +1,5 @@ --- - project: - name: integration-simulators-core-nssmf-simulator-info - project: integration/simulators/core-nssmf-simulator - project-name: integration-simulators-core-nssmf-simulator - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: integration-simulators-core-nssmf-simulator project: integration/simulators/core-nssmf-simulator project-name: integration-simulators-core-nssmf-simulator diff --git a/jjb/integration/simulators/integration-onap-components-simulators.yaml b/jjb/integration/simulators/integration-onap-components-simulators.yaml index dc82c3341..3819e2e8b 100644 --- a/jjb/integration/simulators/integration-onap-components-simulators.yaml +++ b/jjb/integration/simulators/integration-onap-components-simulators.yaml @@ -82,5 +82,4 @@ docker-root: "$WORKSPACE" mvn-settings: "integration-settings" build-node: ubuntu1804-docker-8c-8g - cron: "@daily" container-tag-method: stream diff --git a/jjb/integration/simulators/integration-pnf-simulator.yaml b/jjb/integration/simulators/integration-pnf-simulator.yaml index ff682a2c0..41ca03bf8 100644 --- a/jjb/integration/simulators/integration-pnf-simulator.yaml +++ b/jjb/integration/simulators/integration-pnf-simulator.yaml @@ -40,7 +40,6 @@ 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: integration/simulators/pnf-simulator project-name: integration-pnf-simulator @@ -50,15 +49,6 @@ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: - name: integration-simulators-pnf-simulator-info - project-name: integration-pnf-simulator - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: integration/simulators/pnf-simulator - branch: master - -- project: name: integration-simulators-pnf-simulator-cli project: integration/simulators/pnf-simulator project-name: integration-pnf-simulator diff --git a/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml b/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml index 83456d9ea..7da65b678 100644 --- a/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml +++ b/jjb/integration/simulators/integration-ran-nssmf-simulator.yaml @@ -6,14 +6,6 @@ - project-view - project: - name: integration-simulators-ran-nssmf-simulator-info - project: integration/simulators/ran-nssmf-simulator - project-name: integration-simulators-ran-nssmf-simulator - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: integration-simulators-ran-nssmf-simulator-linters project: integration/simulators/ran-nssmf-simulator project-name: integration-simulators-ran-nssmf-simulator diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml index c630a870f..b50fff3c7 100644 --- a/jjb/integration/simulators/integration-ran-simulator.yaml +++ b/jjb/integration/simulators/integration-ran-simulator.yaml @@ -28,15 +28,6 @@ mvn-goals: "clean deploy" - project: - name: integration-simulators-ran-simulator-info - project-name: integration-simulators-ran-simulator - jobs: - - gerrit-info-yaml-verify - build-node: centos8-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 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 36a625e4e..4136468cd 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 @@ -41,7 +41,6 @@ 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: "integration/simulators/nf-simulator/pm-https-server" project-name: "integration-simulators-nf-simulator-pm-https-server" @@ -55,11 +54,3 @@ project-name: integration-simulators-nf-simulator-pm-https-server views: - project-view - -- project: - name: integration-simulators-nf-simulator-pm-https-server-info - project: integration/simulators/nf-simulator/pm-https-server - project-name: integration-simulators-nf-simulator-pm-https-server - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify 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 df86a28c0..a09da64df 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 @@ -41,7 +41,6 @@ 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: "integration/simulators/nf-simulator/avcn-manager" project-name: "integration-simulators-nf-simulator-avcn-manager" @@ -55,11 +54,3 @@ project-name: integration-simulators-nf-simulator-avcn-manager views: - project-view - -- project: - name: integration-simulators-nf-simulator-avcn-manager-info - project: integration/simulators/nf-simulator/avcn-manager - project-name: integration-simulators-nf-simulator-avcn-manager - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify 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 8c0039c51..8461e4da0 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 @@ -40,7 +40,6 @@ 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: "integration/simulators/nf-simulator/netconf-server" project-name: "integration-simulators-nf-simulator-netconf-server" @@ -54,11 +53,3 @@ project-name: integration-simulators-nf-simulator-netconf-server views: - project-view - -- project: - name: integration-simulators-nf-simulator-netconf-server-info - project: integration/simulators/nf-simulator/netconf-server - project-name: integration-simulators-nf-simulator-netconf-server - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify 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 af4f05a75..cfa4e9e53 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 @@ -22,7 +22,6 @@ name: integration-simulators-nf-simulator-sonar jobs: - gerrit-tox-sonar - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "integration/simulators/nf-simulator" project-name: "integration-simulators-nf-simulator" @@ -30,12 +29,3 @@ mvn-settings: "integration-simulators-nf-simulator-settings" mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - -- project: - name: integration-simulators-nf-simulator-info - jobs: - - gerrit-info-yaml-verify - 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 a8ad871ed..f08ed1717 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 @@ -41,7 +41,6 @@ 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: "integration/simulators/nf-simulator/ves-client" project-name: "integration-simulators-nf-simulator-ves-client" @@ -55,11 +54,3 @@ project-name: integration-simulators-nf-simulator-ves-client views: - project-view - -- project: - 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: 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 68806f2cf..0761f71fa 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 @@ -1,13 +1,5 @@ --- - project: - 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: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: integration-usecases-A1-policy-enforcement-r-apps-linters project: integration/usecases/A1-policy-enforcement-r-apps project-name: integration-usecases-A1-policy-enforcement-r-apps diff --git a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml index aa3c77ba1..193e45ecf 100644 --- a/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml +++ b/jjb/integration/usecases/integration-usecases-A1-policy-enforcement.yaml @@ -1,13 +1,5 @@ --- - project: - name: integration-usecases-A1-policy-enforcement-info - project: integration/usecases/A1-policy-enforcement - project-name: integration-usecases-A1-policy-enforcement - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: integration-usecases-A1-policy-enforcement-linters project: integration/usecases/A1-policy-enforcement project-name: integration-usecases-A1-policy-enforcement diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml index cd7dce7d6..3f7637628 100644 --- a/jjb/integration/xtesting/integration-xtesting.yaml +++ b/jjb/integration/xtesting/integration-xtesting.yaml @@ -1,14 +1,5 @@ --- - project: - name: integration-xtesting-info - project-name: integration-xtesting - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: integration/xtesting - branch: master - -- project: name: integration-xtesting-linters project: integration/xtesting project-name: integration-xtesting @@ -130,5 +121,4 @@ docker-root: "$WORKSPACE" mvn-settings: "integration-settings" build-node: ubuntu1804-docker-8c-8g - cron: "@daily" container-tag-method: stream diff --git a/jjb/lf-infra-sandbox-3.yaml b/jjb/lf-infra-sandbox-3.yaml deleted file mode 100644 index 4bd142b73..000000000 --- a/jjb/lf-infra-sandbox-3.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: sandbox-3 - project-name: sandbox-3 - jobs: - - gerrit-info-yaml-verify - 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 562068374..ddc8dd156 100644 --- a/jjb/modeling/modeling-etsicatalog.yaml +++ b/jjb/modeling/modeling-etsicatalog.yaml @@ -40,7 +40,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "modeling/etsicatalog" project-name: "modeling-etsicatalog" @@ -59,12 +58,3 @@ build-node: centos8-redis-4c-4g branch: "master" mvn-settings: "modeling-etsicatalog-settings" - -- project: - name: modeling-etsicatalog-info - project-name: modeling-etsicatalog - jobs: - - gerrit-info-yaml-verify - 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 deleted file mode 100644 index 8a0b3d69c..000000000 --- a/jjb/modeling/modeling-modelspec.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: modeling-modelspec-info - project-name: modeling-modelspec - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: modeling/modelspec - branch: master diff --git a/jjb/modeling/modeling-yang-kit.yaml b/jjb/modeling/modeling-yang-kit.yaml new file mode 100644 index 000000000..c28ed4b2a --- /dev/null +++ b/jjb/modeling/modeling-yang-kit.yaml @@ -0,0 +1,58 @@ +--- +- project: + name: modeling-yang-kit + project-name: "modeling-yang-kit" + project: "modeling/yang-kit" + stream: + - "master": + branch: "master" + mvn-settings: "modeling-yang-kit-settings" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java" + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + sbom-generator: true + build-node: ubuntu1804-docker-8c-8g + mvn-params: "-P docker -Dmaven.test.skip=true" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + java-version: openjdk11 + files: "**" + archive-artifacts: "" + docker-pom: "pom.xml" + build-node: ubuntu1804-builder-4c-4g + +- project: + name: modeling-yang-kit-sonar + jobs: + - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + build-node: ubuntu1804-builder-4c-4g + project: "modeling/yang-kit" + project-name: "modeling-yang-kit" + branch: "master" + mvn-settings: "modeling-yang-kit-settings" + mvn-goals: "clean install" + mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" + +- project: + name: modeling-yang-kit-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: "onap-" + project: modeling/yang-kit + project-name: "modeling-yang-kit" + build-node: ubuntu1804-builder-4c-4g + branch: "master" + mvn-settings: "modeling-yang-kit-settings" + java-version: openjdk11 diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index 6fe325758..3ecaf4c6d 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -43,7 +43,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "msb/apigateway" project-name: "msb-apigateway" @@ -61,12 +60,3 @@ project-name: "msb-apigateway" branch: "master" mvn-settings: "msb-apigateway-settings" - -- project: - name: msb-apigateway-info - project-name: msb-apigateway - jobs: - - gerrit-info-yaml-verify - 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 f5f4ca60a..7f7f2d86e 100644 --- a/jjb/msb/msb-discovery.yaml +++ b/jjb/msb/msb-discovery.yaml @@ -37,7 +37,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "msb/discovery" project-name: "msb-discovery" @@ -55,12 +54,3 @@ project-name: "msb-discovery" branch: "master" mvn-settings: "msb-discovery-settings" - -- project: - name: msb-discovery-info - project-name: msb-discovery - jobs: - - gerrit-info-yaml-verify - 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 2f25b1ea4..9eded3b91 100644 --- a/jjb/msb/msb-java-sdk.yaml +++ b/jjb/msb/msb-java-sdk.yaml @@ -27,7 +27,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "msb/java-sdk" project-name: "msb-java-sdk" @@ -45,12 +44,3 @@ project-name: "msb-java-sdk" branch: "master" mvn-settings: "msb-java-sdk-settings" - -- project: - name: msb-java-sdk-info - project-name: msb-java-sdk - jobs: - - gerrit-info-yaml-verify - 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 c6c99d870..8369db89f 100644 --- a/jjb/msb/msb-swagger-sdk.yaml +++ b/jjb/msb/msb-swagger-sdk.yaml @@ -27,7 +27,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "msb/swagger-sdk" project-name: "msb-swagger-sdk" @@ -45,12 +44,3 @@ project-name: "msb-swagger-sdk" branch: "master" mvn-settings: "msb-swagger-sdk-settings" - -- project: - name: msb-swagger-sdk-info - project-name: msb-swagger-sdk - jobs: - - gerrit-info-yaml-verify - 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 eb665e72c..33dfffda7 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -47,7 +47,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "multicloud/framework" project-name: "multicloud-framework-multivimbroker" @@ -78,7 +77,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "multicloud/framework" project-name: "multicloud-framework-artifactbroker" diff --git a/jjb/multicloud/multicloud-framework.yaml b/jjb/multicloud/multicloud-framework.yaml deleted file mode 100644 index 2a2733afc..000000000 --- a/jjb/multicloud/multicloud-framework.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: multicloud-framework-info - project-name: multicloud-framework - jobs: - - gerrit-info-yaml-verify - 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 deleted file mode 100644 index 9f392806c..000000000 --- a/jjb/multicloud/multicloud-info.yaml +++ /dev/null @@ -1,36 +0,0 @@ ---- -- project: - name: multicloud-info - project-name: multicloud - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: multicloud - branch: master - -- project: - name: multicloud-windriver-info - project-name: multicloud-windriver - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: multicloud/openstack/windriver - branch: master - -- project: - name: multicloud-oom-info - project-name: multicloud-oom - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: multicloud/oom - branch: master - -- project: - name: multicloud-k8s-info - project-name: multicloud-k8s - jobs: - - gerrit-info-yaml-verify - 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 eba77f4e0..04201d305 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -44,7 +44,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "multicloud/openstack/vmware" project-name: "multicloud-openstack-vmware" @@ -67,13 +66,3 @@ branch: "master" mvn-settings: "multicloud-openstack-vmware-settings" disabled: true - -- project: - name: multicloud-openstack-vmware-info - project-name: multicloud-openstack-vmware - jobs: - - gerrit-info-yaml-verify - 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 7b4bdd683..dc58c11d6 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -51,7 +51,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "multicloud/openstack" project-name: "multicloud-openstack-windriver" @@ -69,7 +68,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "multicloud/openstack" project-name: "multicloud-openstack-pike" @@ -87,7 +85,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "multicloud/openstack" project-name: "multicloud-openstack-starlingx" @@ -118,7 +115,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "multicloud/openstack" project-name: "multicloud-openstack-fcaps" @@ -136,7 +132,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "multicloud/openstack" project-name: "multicloud-openstack-hpa" @@ -145,12 +140,3 @@ mvn-settings: "multicloud-openstack-settings" mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - -- project: - name: multicloud-openstack-info - project-name: multicloud-openstack - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: multicloud/openstack - branch: master 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 7a5f037d9..2b9c5a0c5 100644 --- a/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml +++ b/jjb/oom-platform-cert-manager/oom-platform-cert-manager.yaml @@ -4,11 +4,3 @@ project-name: oom-platform-cert-manager views: - project-view - -- project: - name: oom-platform-cert-manager-info - project: oom/platform/cert-manager - project-name: oom-platform-cert-manager - 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 174936f7e..2c79c95c2 100644 --- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml @@ -6,14 +6,6 @@ - project-view - project: - name: oom-platform-cert-service-info - project: oom/platform/cert-service - project-name: oom-platform-cert-service - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: oom-platform-cert-service project-name: "oom-platform-cert-service" stream: @@ -61,7 +53,6 @@ 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: "oom/platform/cert-service" project-name: "oom-platform-cert-service" diff --git a/jjb/oom-utils/oom-utils.yaml b/jjb/oom-utils/oom-utils.yaml index fe55f1558..a723c53e3 100644 --- a/jjb/oom-utils/oom-utils.yaml +++ b/jjb/oom-utils/oom-utils.yaml @@ -4,11 +4,3 @@ project-name: oom-utils views: - project-view - -- project: - name: oom-utils-info - project: oom/utils - project-name: oom-utils - 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 3f74e44a0..955498497 100644 --- a/jjb/oom/offline-installer.yaml +++ b/jjb/oom/offline-installer.yaml @@ -8,23 +8,14 @@ stream: - "master": branch: "master" - - "london": - branch: "london" + - "montreal": + branch: "montreal" jobs: - "{project-name}-{stream}-review": build_script: "{offline_review_bootstrap}" - project: - name: offline-installer-info - project-name: offline-installer - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: oom/offline-installer - branch: master - -- project: name: offline-installer-linters project: oom/offline-installer project-name: offline-installer diff --git a/jjb/oom/oom-consul.yaml b/jjb/oom/oom-consul.yaml index a660cee81..0c9b1edc0 100644 --- a/jjb/oom/oom-consul.yaml +++ b/jjb/oom/oom-consul.yaml @@ -6,14 +6,6 @@ - project-view - project: - name: oom-consul-info - project: oom/consul - project-name: oom-consul - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: oom-consul-linters project: oom/consul project-name: oom-consul diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 0753e1cdc..7bda27a26 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -50,8 +50,8 @@ stream: - "master": branch: "master" - - "london": - branch: "london" + - "montreal": + branch: "montreal" jobs: - "{project-name}-{stream}-verify-make-{helm_bin}": diff --git a/jjb/oom/oom-main-linter.yaml b/jjb/oom/oom-main-linter.yaml index b3e4df2f4..65c318d49 100644 --- a/jjb/oom/oom-main-linter.yaml +++ b/jjb/oom/oom-main-linter.yaml @@ -31,7 +31,7 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" + - "montreal": + branch: "montreal" - "london": branch: "london" diff --git a/jjb/oom/oom-oneclick-config.yaml b/jjb/oom/oom-oneclick-config.yaml index 670d1faa8..a7c736fb8 100644 --- a/jjb/oom/oom-oneclick-config.yaml +++ b/jjb/oom/oom-oneclick-config.yaml @@ -47,12 +47,3 @@ - shell: !include-raw-escape: oneclick-config-make-tar.sh - shell: !include-raw-escape: oneclick-config-build-docker-image.sh - shell: !include-raw-escape: ../include-docker-push.sh - -- project: - name: oomconfig-info - project-name: oomconfig - jobs: - - gerrit-info-yaml-verify - 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 c804841d7..fcfb17f90 100644 --- a/jjb/oom/oom-readiness.yaml +++ b/jjb/oom/oom-readiness.yaml @@ -1,14 +1,5 @@ --- - project: - name: oom-readiness-info - project-name: oom-readiness - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: oom/readiness - branch: master - -- project: name: oom-readiness-linters project: oom/readiness project-name: oom-readiness diff --git a/jjb/oom/oom-registrator.yaml b/jjb/oom/oom-registrator.yaml index 64370f3cd..932a16416 100644 --- a/jjb/oom/oom-registrator.yaml +++ b/jjb/oom/oom-registrator.yaml @@ -39,12 +39,3 @@ project-name: "oom-registrator" branch: "master" mvn-settings: "oom-registrator-settings" - -- project: - name: oom-registrator-info - project-name: oom-registrator - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: oom/registrator - branch: master diff --git a/jjb/oparent/oparent.yaml b/jjb/oparent/oparent.yaml index b6defddad..07b41aff6 100644 --- a/jjb/oparent/oparent.yaml +++ b/jjb/oparent/oparent.yaml @@ -40,12 +40,3 @@ project-name: "oparent" branch: "master" mvn-settings: "oparent-settings" - -- project: - name: oparent-info - project-name: oparent - jobs: - - gerrit-info-yaml-verify - 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 e06bfb58b..b97a2df1a 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -47,7 +47,6 @@ 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: "optf/has" project-name: "optf-has" @@ -68,12 +67,3 @@ - "master": branch: "master" mvn-settings: "optf-has-settings" - -- project: - name: optf-has-info - project-name: optf-has - jobs: - - gerrit-info-yaml-verify - 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 0ed404cfb..8e7ab47d5 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -48,7 +48,6 @@ 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: "optf/osdf" project-name: "optf-osdf" @@ -69,12 +68,3 @@ - "master": branch: "master" mvn-settings: "optf-osdf-settings" - -- project: - name: optf-osdf-info - project-name: optf-osdf - jobs: - - gerrit-info-yaml-verify - 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 9dd5957ec..62b6ed76b 100644 --- a/jjb/policy/policy-apex-pdp.yaml +++ b/jjb/policy/policy-apex-pdp.yaml @@ -6,7 +6,7 @@ - project-view - project: - name: policy-apex-pdp + name: policy-apex-pdp-java-17 project-name: "policy-apex-pdp" jobs: - "{project-name}-{stream}-verify-java" @@ -34,14 +34,43 @@ stream: - "master": branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" + - "montreal": + branch: "montreal" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-apex-pdp-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-docker-8c-8g + +- project: + name: policy-apex-pdp + project-name: "policy-apex-pdp" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java": + docker-pom: "pom.xml" + mvn-profile: "docker" + mvn-params: "-P docker" + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + mvn-params: "-Dmaven.test.skip=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" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/apex-pdp" + stream: - "london": branch: "london" mvn-settings: "policy-apex-pdp-settings" @@ -58,15 +87,15 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "policy/apex-pdp" project-name: "policy-apex-pdp" branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-apex-pdp-settings" - java-version: openjdk11 + java-version: openjdk17 mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: policy-apex-pdp-clm @@ -78,14 +107,8 @@ stream: - "master": branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-apex-pdp-settings" - java-version: openjdk11 - -- project: - name: policy-apex-pdp-info - project-name: policy-apex-pdp - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: policy/apex-pdp - branch: master + mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" + java-version: openjdk17 diff --git a/jjb/policy/policy-api.yaml b/jjb/policy/policy-api.yaml index 2a3641d44..a1a6c15f2 100644 --- a/jjb/policy/policy-api.yaml +++ b/jjb/policy/policy-api.yaml @@ -1,6 +1,6 @@ --- - project: - name: policy-api + name: policy-api-java-17 project-name: "policy-api" jobs: - "{project-name}-{stream}-verify-java" @@ -28,14 +28,43 @@ stream: - "master": branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" + - "montreal": + branch: "montreal" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-api-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-builder-4c-4g + +- project: + name: policy-api-java11 + project-name: "policy-api" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java": + docker-pom: "pom.xml" + mvn-params: "-P docker" + build-node: ubuntu1804-docker-8c-8g + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + mvn-params: "-Dmaven.test.skip=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" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/api" + stream: - "london": branch: "london" mvn-settings: "policy-api-settings" @@ -52,15 +81,15 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "policy/api" project-name: "policy-api" branch: "master" mvn-settings: "policy-api-settings" - java-version: openjdk11 + java-version: openjdk17 + mvn-version: "mvn36" + maven-version: "mvn36" mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: policy-api-clm @@ -72,14 +101,8 @@ stream: - "master": branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-api-settings" - java-version: openjdk11 - -- project: - name: policy-api-info - project-name: policy-api - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: policy/api - branch: master + mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" + java-version: openjdk17 diff --git a/jjb/policy/policy-clamp.yaml b/jjb/policy/policy-clamp.yaml index 74f403e0c..b4d885c8b 100644 --- a/jjb/policy/policy-clamp.yaml +++ b/jjb/policy/policy-clamp.yaml @@ -1,6 +1,6 @@ --- - project: - name: policy-clamp + name: policy-clamp-java-17 project-name: "policy-clamp" jobs: - gerrit-maven-stage: @@ -17,7 +17,6 @@ container-staging-registry: "nexus3.onap.org:10003" mvn-params: "-Dmaven.test.skip=true -P docker" - "{project-name}-{stream}-verify-java": - mvn-params: "-P docker" build-node: ubuntu1804-docker-8c-16g - "{project-name}-{stream}-merge-java": build-node: ubuntu1804-docker-8c-16g @@ -29,14 +28,44 @@ stream: - "master": branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" + - "montreal": + branch: "montreal" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-clamp-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-docker-8c-8g + +- project: + name: policy-clamp-java11 + project-name: "policy-clamp" + jobs: + - gerrit-maven-stage: + build-node: centos8-docker-8c-8g + sbom-generator: true + maven-versions-plugin: true + sign-artifacts: true + mvn-params: "-Dmaven.test.skip=true" + - gerrit-maven-docker-stage: + sbom-generator: true + build-node: ubuntu1804-docker-8c-8g + maven-versions-plugin: true + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + mvn-params: "-Dmaven.test.skip=true -P docker" + - "{project-name}-{stream}-verify-java": + mvn-params: "-P docker" + build-node: ubuntu1804-docker-8c-16g + - "{project-name}-{stream}-merge-java": + build-node: ubuntu1804-docker-8c-16g + mvn-params: "-P docker" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/clamp" + stream: - "london": branch: "london" mvn-settings: "policy-clamp-settings" @@ -53,15 +82,15 @@ 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: "policy/clamp" project-name: "policy-clamp" branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-clamp-settings" mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - java-version: openjdk11 + java-version: openjdk17 - project: name: policy-clamp-clm @@ -73,15 +102,9 @@ stream: - "master": branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-clamp-settings" + mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" build-node: ubuntu1804-docker-8c-8g - java-version: openjdk11 - -- project: - name: policy-clamp-info - project-name: policy-clamp - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: policy/clamp - branch: master + java-version: openjdk17 diff --git a/jjb/policy/policy-common.yaml b/jjb/policy/policy-common.yaml index 3bf4aaa26..e9edb0239 100644 --- a/jjb/policy/policy-common.yaml +++ b/jjb/policy/policy-common.yaml @@ -1,6 +1,6 @@ --- - project: - name: policy-common + name: policy-common-java-17 project-name: "policy-common" jobs: - "{project-name}-{stream}-verify-java" @@ -18,14 +18,33 @@ stream: - "master": branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" + - "montreal": + branch: "montreal" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-common-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-builder-4c-4g + +- project: + name: policy-common-java11 + project-name: "policy-common" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java" + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + mvn-params: "-Dmaven.test.skip=true" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/common" + stream: - "london": branch: "london" mvn-settings: "policy-common-settings" @@ -42,15 +61,15 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "policy/common" project-name: "policy-common" branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-common-settings" - java-version: openjdk11 + java-version: openjdk17 mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: policy-common-clm @@ -62,14 +81,8 @@ stream: - "master": branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-common-settings" - java-version: openjdk11 - -- project: - name: policy-common-info - project-name: policy-common - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: policy/common - branch: master + mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" + java-version: openjdk17 diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml index b42b40258..993a1fb82 100644 --- a/jjb/policy/policy-csit-jobs.yaml +++ b/jjb/policy/policy-csit-jobs.yaml @@ -6,7 +6,7 @@ build-node: "ubuntu1804-docker-8c-8g" node: "{build-node}" recipients: "" - java-version: "openjdk11" + java-version: "openjdk17" python-version: python3 properties: @@ -63,7 +63,7 @@ build-node: "ubuntu1804-docker-8c-8g" node: "{build-node}" recipients: "" - java-version: "openjdk11" + java-version: "openjdk17" python-version: python3 properties: diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index f5e42e7a9..774cd1ef7 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -10,16 +10,10 @@ stream: - "master": branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" functionality: - "distribution" trigger_jobs: @@ -37,16 +31,10 @@ stream: - "master": branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" functionality: - "xacml-pdp" trigger_jobs: @@ -64,16 +52,10 @@ stream: - "master": branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" functionality: - "drools-applications" trigger_jobs: @@ -91,16 +73,10 @@ stream: - "master": branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" functionality: - "drools-pdp" trigger_jobs: @@ -118,16 +94,10 @@ stream: - "master": branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" functionality: - "apex-pdp" trigger_jobs: @@ -145,16 +115,10 @@ stream: - "master": branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" functionality: - "pap" trigger_jobs: @@ -172,16 +136,10 @@ stream: - "master": branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" functionality: - "api" trigger_jobs: @@ -199,16 +157,8 @@ stream: - "master": branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - - "london": - branch: "london" + - "montreal": + branch: "montreal" functionality: - "clamp" trigger_jobs: diff --git a/jjb/policy/policy-distribution.yaml b/jjb/policy/policy-distribution.yaml index 8b4e123a8..965d16f3c 100644 --- a/jjb/policy/policy-distribution.yaml +++ b/jjb/policy/policy-distribution.yaml @@ -1,6 +1,6 @@ --- - project: - name: policy-distribution + name: policy-distribution-java-17 project-name: "policy-distribution" jobs: - "{project-name}-{stream}-verify-java" @@ -28,14 +28,43 @@ stream: - "master": branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" + - "montreal": + branch: "montreal" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-distribution-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-builder-4c-4g + +- project: + name: policy-distribution-java11 + project-name: "policy-distribution" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java": + docker-pom: "pom.xml" + mvn-params: "-P docker" + build-node: ubuntu1804-docker-8c-8g + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + mvn-params: "-Dmaven.test.skip=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" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/distribution" + stream: - "london": branch: "london" mvn-settings: "policy-distribution-settings" @@ -52,15 +81,15 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "policy/distribution" project-name: "policy-distribution" branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-distribution-settings" - java-version: openjdk11 + java-version: openjdk17 mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: policy-distribution-clm @@ -72,14 +101,8 @@ stream: - "master": branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-distribution-settings" - java-version: openjdk11 - -- project: - name: policy-distribution-info - project-name: policy-distribution - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: policy/distribution - branch: master + mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" + java-version: openjdk17 diff --git a/jjb/policy/policy-docker-base-common.yaml b/jjb/policy/policy-docker-base-common.yaml index 7b646e8d7..ee6ae2ce4 100644 --- a/jjb/policy/policy-docker-base-common.yaml +++ b/jjb/policy/policy-docker-base-common.yaml @@ -24,16 +24,6 @@ project: "policy/docker" stream: - - "master": - branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" files: "**" @@ -41,6 +31,41 @@ build-node: ubuntu1804-builder-4c-4g - project: + name: policy-docker-base-common-java-17 + project-name: "policy-docker" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java": + docker-pom: "pom.xml" + mvn-profile: "docker" + mvn-params: "-P docker" + build-node: ubuntu1804-docker-8c-8g + - 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" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-docker-settings" + mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false" + java-version: openjdk17 + + project: "policy/docker" + stream: + - "master": + branch: "master" + - "montreal": + branch: "montreal" + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-builder-4c-4g + +- project: name: policy-docker-clm jobs: - gerrit-maven-clm @@ -50,15 +75,8 @@ stream: - "master": branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-docker-settings" mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false" - java-version: openjdk11 - -- project: - name: policy-docker-info - project-name: policy-docker - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: policy/docker - branch: master + java-version: openjdk17 diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml index 41ec7e75e..6e19128c2 100644 --- a/jjb/policy/policy-drools-applications.yaml +++ b/jjb/policy/policy-drools-applications.yaml @@ -26,16 +26,6 @@ project: "policy/drools-applications" stream: - - "master": - branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" mvn-settings: "policy-drools-applications-settings" @@ -47,6 +37,45 @@ build-node: ubuntu1804-docker-8c-8g - project: + name: policy-drools-applications-java-17 + project-name: "policy-drools-applications" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java": + docker-pom: "pom.xml" + mvn-profile: "docker" + mvn-params: "-P docker -Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false" + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + mvn-params: "-Dmaven.test.skip=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" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/drools-applications" + stream: + - "master": + branch: "master" + - "montreal": + branch: "montreal" + mvn-settings: "policy-drools-applications-settings" + mvn-version: "mvn36" + maven-version: "mvn36" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-docker-8c-8g + +- project: name: policy-drools-applications-sonar jobs: - gerrit-maven-sonar @@ -54,7 +83,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "policy/drools-applications" project-name: "policy-drools-applications" @@ -62,10 +90,9 @@ mvn-settings: "policy-drools-applications-settings" mvn-version: "mvn36" maven-version: "mvn36" - java-version: openjdk11 + java-version: openjdk17 java-opts: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false" mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: policy-drools-applications-clm @@ -79,16 +106,8 @@ branch: "master" mvn-settings: "policy-drools-applications-settings" mvn-params: "-Djava.net.preferIPv4Stack=true -Djava.net.preferIPv6Addresses=false" + mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" mvn-version: "mvn36" maven-version: "mvn36" - java-version: openjdk11 + java-version: openjdk17 build-node: ubuntu1804-docker-8c-8g - -- project: - name: policy-drools-applications-info - project-name: policy-drools-applications - jobs: - - gerrit-info-yaml-verify - 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 8cb8f9092..14a992180 100644 --- a/jjb/policy/policy-drools-pdp.yaml +++ b/jjb/policy/policy-drools-pdp.yaml @@ -26,16 +26,6 @@ project: "policy/drools-pdp" stream: - - "master": - branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" mvn-settings: "policy-drools-pdp-settings" @@ -45,6 +35,45 @@ build-node: ubuntu1804-docker-8c-8g - project: + name: policy-drools-pdp-java-17 + project-name: "policy-drools-pdp" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java": + docker-pom: "pom.xml" + mvn-profile: "docker" + mvn-params: "-P docker" + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + mvn-params: "-Dmaven.test.skip=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" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/drools-pdp" + stream: + - "master": + branch: "master" + - "montreal": + branch: "montreal" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-drools-pdp-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-docker-8c-8g + +- project: name: policy-drools-pdp-sonar jobs: - gerrit-maven-sonar @@ -52,15 +81,15 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "policy/drools-pdp" project-name: "policy-drools-pdp" branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-drools-pdp-settings" - java-version: openjdk11 + java-version: openjdk17 mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: policy-drools-pdp-clm @@ -73,14 +102,8 @@ stream: - "master": branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-drools-pdp-settings" - java-version: openjdk11 - -- project: - name: policy-drools-pdp-info - project-name: policy-drools-pdp - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: policy/drools-pdp - branch: master + mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" + java-version: openjdk17 diff --git a/jjb/policy/policy-gui.yaml b/jjb/policy/policy-gui.yaml index 21b80f274..22675c1d9 100644 --- a/jjb/policy/policy-gui.yaml +++ b/jjb/policy/policy-gui.yaml @@ -26,14 +26,6 @@ project: "policy/gui" stream: - - "master": - branch: "master" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" mvn-settings: "policy-gui-settings" @@ -43,6 +35,45 @@ build-node: ubuntu1804-builder-4c-4g - project: + name: policy-gui-java-17 + project-name: "policy-gui" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java": + docker-pom: "pom.xml" + mvn-params: "-P docker" + build-node: ubuntu1804-docker-8c-8g + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + mvn-params: "-Dmaven.test.skip=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" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/gui" + stream: + - "master": + branch: "master" + - "montreal": + branch: "montreal" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-gui-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-builder-4c-4g + +- project: name: policy-gui-sonar jobs: - gerrit-maven-sonar-prescan-script @@ -50,15 +81,15 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "policy/gui" project-name: "policy-gui" branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-gui-settings" - java-version: openjdk11 + java-version: openjdk17 mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" sonar-prescan-script: !include-raw-escape: ../ubuntu-latest-nodejs.sh - project: @@ -71,14 +102,8 @@ stream: - "master": branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-gui-settings" - java-version: openjdk11 - -- project: - name: policy-gui-info - project-name: policy-gui - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: policy/gui - branch: master + mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" + java-version: openjdk17 diff --git a/jjb/policy/policy-models.yaml b/jjb/policy/policy-models.yaml index e4daf053a..c84ce415e 100644 --- a/jjb/policy/policy-models.yaml +++ b/jjb/policy/policy-models.yaml @@ -1,6 +1,6 @@ --- - project: - name: policy-models + name: policy-models-java-17 project-name: "policy-models" jobs: - "{project-name}-{stream}-verify-java" @@ -28,14 +28,43 @@ stream: - "master": branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" + - "montreal": + branch: "montreal" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-models-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-builder-4c-4g + +- project: + name: policy-models-java11 + project-name: "policy-models" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java": + docker-pom: "pom.xml" + mvn-params: "-P docker" + build-node: ubuntu1804-docker-8c-8g + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + mvn-params: "-Dmaven.test.skip=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" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/models" + stream: - "london": branch: "london" mvn-settings: "policy-models-settings" @@ -52,15 +81,15 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "policy/models" project-name: "policy-models" branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-models-settings" - java-version: openjdk11 + java-version: openjdk17 mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: policy-models-clm @@ -72,14 +101,8 @@ stream: - "master": branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-models-settings" - java-version: openjdk11 - -- project: - name: policy-models-info - project-name: policy-models - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: policy/models - branch: master + mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" + java-version: openjdk17 diff --git a/jjb/policy/policy-pap.yaml b/jjb/policy/policy-pap.yaml index c6a6521b0..a62ae1c25 100644 --- a/jjb/policy/policy-pap.yaml +++ b/jjb/policy/policy-pap.yaml @@ -1,6 +1,6 @@ --- - project: - name: policy-pap + name: policy-pap-java-17 project-name: "policy-pap" jobs: - "{project-name}-{stream}-verify-java" @@ -28,14 +28,43 @@ stream: - "master": branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" + - "montreal": + branch: "montreal" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-pap-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-builder-4c-4g + +- project: + name: policy-pap-java11 + project-name: "policy-pap" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java": + docker-pom: "pom.xml" + mvn-params: "-P docker" + build-node: ubuntu1804-docker-8c-8g + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + mvn-params: "-Dmaven.test.skip=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" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/pap" + stream: - "london": branch: "london" mvn-settings: "policy-pap-settings" @@ -52,15 +81,15 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "policy/pap" project-name: "policy-pap" branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-pap-settings" - java-version: openjdk11 + java-version: openjdk17 mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: policy-pap-clm @@ -72,14 +101,8 @@ stream: - "master": branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-pap-settings" - java-version: openjdk11 - -- project: - name: policy-pap-info - project-name: policy-pap - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: policy/pap - branch: master + mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" + java-version: openjdk17 diff --git a/jjb/policy/policy-parent.yaml b/jjb/policy/policy-parent.yaml index 0c1a04ca4..d20db0336 100644 --- a/jjb/policy/policy-parent.yaml +++ b/jjb/policy/policy-parent.yaml @@ -1,6 +1,6 @@ --- - project: - name: policy-parent + name: policy-parent-java-17 project-name: "policy-parent" jobs: - "{project-name}-{stream}-verify-java" @@ -18,14 +18,33 @@ stream: - "master": branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" + - "montreal": + branch: "montreal" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-parent-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-builder-4c-4g + +- project: + name: policy-parent-java11 + project-name: "policy-parent" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java" + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + mvn-params: "-Dmaven.test.skip=true" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/parent" + stream: - "london": branch: "london" mvn-settings: "policy-parent-settings" @@ -44,14 +63,8 @@ stream: - "master": branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-parent-settings" - java-version: openjdk11 - -- project: - name: policy-parent-info - project-name: policy-parent - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: policy/parent - branch: master + mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" + java-version: openjdk17 diff --git a/jjb/policy/policy-xacml-pdp.yaml b/jjb/policy/policy-xacml-pdp.yaml index 244e97f0b..4f25778d9 100644 --- a/jjb/policy/policy-xacml-pdp.yaml +++ b/jjb/policy/policy-xacml-pdp.yaml @@ -26,16 +26,6 @@ project: "policy/xacml-pdp" stream: - - "master": - branch: "master" - - "honolulu": - branch: "honolulu" - - "istanbul": - branch: "istanbul" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" mvn-settings: "policy-xacml-pdp-settings" @@ -45,6 +35,45 @@ build-node: ubuntu1804-builder-4c-4g - project: + name: policy-xacml-pdp-java-17 + project-name: "policy-xacml-pdp" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java": + docker-pom: "pom.xml" + mvn-params: "-P docker" + build-node: ubuntu1804-docker-8c-8g + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + mvn-params: "-Dmaven.test.skip=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" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "policy/xacml-pdp" + stream: + - "master": + branch: "master" + - "montreal": + branch: "montreal" + mvn-version: "mvn36" + maven-version: "mvn36" + mvn-settings: "policy-xacml-pdp-settings" + java-version: openjdk17 + files: "**" + archive-artifacts: "" + build-node: ubuntu1804-builder-4c-4g + +- project: name: policy-xacml-pdp-sonar jobs: - gerrit-maven-sonar @@ -52,15 +81,15 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "policy/xacml-pdp" project-name: "policy-xacml-pdp" branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-xacml-pdp-settings" - java-version: openjdk11 + java-version: openjdk17 mvn-goals: "clean install" - mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: name: policy-xacml-pdp-clm @@ -72,14 +101,8 @@ stream: - "master": branch: "master" + mvn-version: "mvn36" + maven-version: "mvn36" mvn-settings: "policy-xacml-pdp-settings" - java-version: openjdk11 - -- project: - name: policy-xacml-pdp-info - project-name: policy-xacml-pdp - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: policy/xacml-pdp - branch: master + mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" + java-version: openjdk17 diff --git a/jjb/portal-ng-e2e/portal-ng-e2e.yaml b/jjb/portal-ng-e2e/portal-ng-e2e.yaml index 4670af8a9..2e22c6199 100644 --- a/jjb/portal-ng-e2e/portal-ng-e2e.yaml +++ b/jjb/portal-ng-e2e/portal-ng-e2e.yaml @@ -4,12 +4,3 @@ project-name: portal-ng-e2e views: - project-view - -- project: - name: portal-ng-e2e-info - project: portal-ng/e2e - project-name: portal-ng-e2e - build-node: centos8-builder-2c-1g - branch: master - jobs: - - gerrit-info-yaml-verify diff --git a/jjb/portal-ng/portal-ng-bff.yaml b/jjb/portal-ng/portal-ng-bff.yaml index 8de3dd09a..82d780306 100644 --- a/jjb/portal-ng/portal-ng-bff.yaml +++ b/jjb/portal-ng/portal-ng-bff.yaml @@ -6,22 +6,27 @@ - project-view - project: - name: portal-ng-bff-info - project: portal-ng/bff - project-name: portal-ng-bff - build-node: centos8-builder-2c-1g - branch: master + name: portal-ng-bff-gradle-build + project-name: "portal-ng-bff" + project: "portal-ng/bff" + branch: "master" + build-node: ubuntu1804-docker-8c-8g jobs: - - gerrit-info-yaml-verify + - gerrit-gradle-build + stream: + - "master": + branch: "master" + mvn-settings: "portal-ng-bff-settings" + wrapper: true - project: - name: portal-ng-bff-gradle-build + name: portal-ng-bff-gradle-publish-jar project-name: "portal-ng-bff" project: "portal-ng/bff" branch: "master" build-node: ubuntu1804-docker-8c-8g jobs: - - gerrit-gradle-build + - gerrit-gradle-publish-jar stream: - "master": branch: "master" diff --git a/jjb/portal-ng/portal-ng-history.yaml b/jjb/portal-ng/portal-ng-history.yaml index ef373bfa2..e35493fb7 100644 --- a/jjb/portal-ng/portal-ng-history.yaml +++ b/jjb/portal-ng/portal-ng-history.yaml @@ -6,15 +6,6 @@ - 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 - -- project: name: portal-ng-history-gradle-build project-name: "portal-ng-history" project: "portal-ng/history" diff --git a/jjb/portal-ng/portal-ng-preferences.yaml b/jjb/portal-ng/portal-ng-preferences.yaml index e46d7314c..2f55b2389 100644 --- a/jjb/portal-ng/portal-ng-preferences.yaml +++ b/jjb/portal-ng/portal-ng-preferences.yaml @@ -6,15 +6,6 @@ - project-view - project: - name: portal-ng-preferences-info - project: portal-ng/preferences - project-name: portal-ng-preferences - build-node: centos8-builder-2c-1g - branch: master - jobs: - - gerrit-info-yaml-verify - -- project: name: portal-ng-preferences-gradle-build project-name: "portal-ng-preferences" project: "portal-ng/preferences" diff --git a/jjb/portal-ng/portal-ng-ui.yaml b/jjb/portal-ng/portal-ng-ui.yaml index 48f6cc20b..48ea3296b 100644 --- a/jjb/portal-ng/portal-ng-ui.yaml +++ b/jjb/portal-ng/portal-ng-ui.yaml @@ -6,15 +6,6 @@ - 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 - -- project: name: portal-ng-ui-docker project-name: "portal-ng-ui" project: "portal-ng/ui" diff --git a/jjb/portal-ng/portal-ng.yaml b/jjb/portal-ng/portal-ng.yaml index 6f2bc4aec..39d717e3c 100644 --- a/jjb/portal-ng/portal-ng.yaml +++ b/jjb/portal-ng/portal-ng.yaml @@ -4,12 +4,3 @@ project-name: portal-ng views: - project-view - -- project: - name: portal-ng-info - project: portal-ng - project-name: portal-ng - build-node: centos8-builder-2c-1g - branch: master - jobs: - - gerrit-info-yaml-verify diff --git a/jjb/relman/relman.yaml b/jjb/relman/relman.yaml index 9bd197137..d7176f65f 100644 --- a/jjb/relman/relman.yaml +++ b/jjb/relman/relman.yaml @@ -4,11 +4,3 @@ project-name: relman views: - project-view - -- project: - name: relman-info - project: relman - project-name: relman - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify diff --git a/jjb/rtdv3/rtdv3.yaml b/jjb/rtdv3/rtdv3.yaml index 2ed8d617b..0077c7d9b 100644 --- a/jjb/rtdv3/rtdv3.yaml +++ b/jjb/rtdv3/rtdv3.yaml @@ -35,9 +35,11 @@ - comment-added-contains-event: comment-contains-value: "remerge" jobs: - - rtdv3-global-verify + - rtdv3-global-verify: + disable-job: true - rtdv3-global-merge: build-timeout: 30 + disable-job: true stream: - master: branch: "*" diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index a3a19eee4..d2df7b091 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -35,12 +35,10 @@ stream: - "master": branch: "master" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" java-version: openjdk11 maven-version: "mvn36" mvn-settings: "sdc-settings" diff --git a/jjb/sdc/sdc-onap-ui-angular.yaml b/jjb/sdc/sdc-onap-ui-angular.yaml index ee8a9130d..13017687e 100644 --- a/jjb/sdc/sdc-onap-ui-angular.yaml +++ b/jjb/sdc/sdc-onap-ui-angular.yaml @@ -6,15 +6,6 @@ - project-view - project: - name: sdc-onap-ui-angular-info - project-name: "sdc-onap-ui-angular" - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: "sdc/onap-ui-angular" - branch: "master" - -- project: name: sdc-onap-ui-angular project-name: "sdc-onap-ui-angular" jobs: @@ -24,12 +15,10 @@ stream: - "master": branch: "master" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" mvn-settings: "sdc-onap-ui-angular-settings" files: "**" archive-artifacts: "" @@ -44,7 +33,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "sdc/onap-ui-angular" project-name: "sdc-onap-ui-angular" diff --git a/jjb/sdc/sdc-onap-ui-common.yaml b/jjb/sdc/sdc-onap-ui-common.yaml index 02251cac1..1ad898ad8 100644 --- a/jjb/sdc/sdc-onap-ui-common.yaml +++ b/jjb/sdc/sdc-onap-ui-common.yaml @@ -1,14 +1,5 @@ --- - project: - name: sdc-onap-ui-common-info - project-name: "sdc-onap-ui-common" - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: "sdc/onap-ui-common" - branch: "master" - -- project: name: sdc-onap-ui-common project-name: "sdc-onap-ui-common" jobs: @@ -18,12 +9,10 @@ stream: - "master": branch: "master" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" mvn-settings: "sdc-onap-ui-common-settings" files: "**" archive-artifacts: "" @@ -38,7 +27,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "sdc/onap-ui-common" project-name: "sdc-onap-ui-common" diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml index 2da4cad01..2ef4f8a86 100644 --- a/jjb/sdc/sdc-sdc-be-common.yaml +++ b/jjb/sdc/sdc-sdc-be-common.yaml @@ -22,12 +22,10 @@ stream: - "master": branch: "master" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" mvn-settings: "sdc-sdc-be-common-settings" files: "**" archive-artifacts: "" @@ -42,7 +40,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "sdc/sdc-be-common" project-name: "sdc-sdc-be-common" @@ -63,12 +60,3 @@ - "master": branch: "master" mvn-settings: "sdc-sdc-be-common-settings" - -- project: - name: sdc-sdc-be-common-info - project-name: sdc-sdc-be-common - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: sdc/sdc-be-common - branch: master diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index c67e5c335..000362837 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -24,15 +24,12 @@ - "master": branch: "master" java-version: openjdk11 - - "jakarta": - branch: "jakarta" - java-version: openjdk11 - - "kohn": - branch: "kohn" - java-version: openjdk11 - "london": branch: "london" java-version: openjdk11 + - "montreal": + branch: "montreal" + java-version: openjdk11 mvn-settings: "sdc-sdc-distribution-client-settings" files: "**" archive-artifacts: "" @@ -67,7 +64,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "sdc/sdc-distribution-client" project-name: "sdc-sdc-distribution-client" @@ -90,12 +86,3 @@ branch: "master" mvn-settings: "sdc-sdc-distribution-client-settings" java-version: openjdk11 - -- project: - name: sdc-sdc-distribution-client-info - project-name: sdc-sdc-distribution-client - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: sdc/sdc-distribution-client - branch: master diff --git a/jjb/sdc/sdc-sdc-helm-validator-csit.yaml b/jjb/sdc/sdc-sdc-helm-validator-csit.yaml index 5b19f9c5c..1eaf58fad 100644 --- a/jjb/sdc/sdc-sdc-helm-validator-csit.yaml +++ b/jjb/sdc/sdc-sdc-helm-validator-csit.yaml @@ -8,10 +8,10 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" functionality: - "sdc-helm-validator": trigger_jobs: diff --git a/jjb/sdc/sdc-sdc-helm-validator.yaml b/jjb/sdc/sdc-sdc-helm-validator.yaml index d55c0e24f..bdc5df411 100644 --- a/jjb/sdc/sdc-sdc-helm-validator.yaml +++ b/jjb/sdc/sdc-sdc-helm-validator.yaml @@ -6,14 +6,6 @@ - project-view - project: - name: sdc-sdc-helm-validator-info - project: sdc/sdc-helm-validator - project-name: sdc-sdc-helm-validator - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: sdc-sdc-helm-validator project-name: "sdc-sdc-helm-validator" java-version: openjdk11 @@ -53,7 +45,6 @@ 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: "sdc/sdc-helm-validator" project-name: "sdc-sdc-helm-validator" diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml index 1b76a6e01..8ae46f5ae 100644 --- a/jjb/sdc/sdc-sdc-pubsub.yaml +++ b/jjb/sdc/sdc-sdc-pubsub.yaml @@ -1,14 +1,5 @@ --- - project: - name: sdc-sdc-pubsub-info - project-name: "sdc-sdc-pubsub" - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: "sdc/sdc-pubsub" - branch: "master" - -- project: name: sdc-sdc-pubsub project-name: "sdc-sdc-pubsub" jobs: @@ -18,12 +9,10 @@ stream: - "master": branch: "master" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" mvn-settings: "sdc-sdc-pubsub-settings" files: "**" archive-artifacts: "" @@ -38,7 +27,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "sdc/sdc-pubsub" project-name: "sdc-sdc-pubsub" diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index 37a6f705a..9f6dd3eb9 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -24,12 +24,10 @@ stream: - "master": branch: "master" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" mvn-settings: "sdc-sdc-tosca-settings" files: "**" archive-artifacts: "" @@ -45,7 +43,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "sdc/sdc-tosca" project-name: "sdc-sdc-tosca" @@ -68,13 +65,3 @@ branch: "master" mvn-settings: "sdc-sdc-tosca-settings" java-version: openjdk11 - -- project: - name: sdc-sdc-tosca-info - project-name: sdc-sdc-tosca - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: sdc/sdc-tosca - branch: master - java-version: openjdk11 diff --git a/jjb/sdc/sdc-sdc-workflow-designer.yaml b/jjb/sdc/sdc-sdc-workflow-designer.yaml index 99be2cb35..3f0033a2e 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -32,12 +32,10 @@ stream: - "master": branch: "master" - - "jakarta": - branch: "jakarta" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" mvn-settings: "sdc-sdc-workflow-designer-settings" files: "**" archive-artifacts: "" @@ -54,7 +52,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "sdc/sdc-workflow-designer" project-name: "sdc-sdc-workflow-designer" @@ -78,13 +75,3 @@ branch: "master" mvn-settings: "sdc-sdc-workflow-designer-settings" java-version: openjdk11 - -- project: - name: sdc-sdc-workflow-designer-info - project-name: sdc-sdc-workflow-designer - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: sdc/sdc-workflow-designer - branch: master - java-version: openjdk11 diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index a1aae3d23..d6e68434b 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -76,15 +76,12 @@ - "master": branch: "master" java-version: openjdk11 - - "jakarta": - branch: "jakarta" - java-version: openjdk11 - - "kohn": - branch: "kohn" - java-version: openjdk11 - "london": branch: "london" java-version: openjdk11 + - "montreal": + branch: "montreal" + java-version: openjdk11 mvn-settings: "sdc-settings" files: "**" archive-artifacts: "" @@ -100,7 +97,6 @@ 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-16g project: "sdc" project-name: "sdc" @@ -129,12 +125,3 @@ mvn-version: "mvn36" mvn-settings: "sdc-settings" java-version: openjdk11 - -- project: - name: sdc-info - project-name: sdc - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: sdc - branch: master diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index 5b331f97b..03380e9a4 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -15,7 +15,6 @@ container-staging-registry: "nexus3.onap.org:10003" mvn-params: "-Ddocker.skip.push=true -Pdocker" - gerrit-maven-merge: - cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: build-node: centos8-docker-8c-8g @@ -29,12 +28,13 @@ container-staging-registry: "nexus3.onap.org:10003" mvn-params: "-Dmaven.test.skip=true -Pdocker" maven-versions-plugin: true - cron: "@daily" - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g project: "sdnc/apps" stream: + - "montreal": + branch: "montreal" - "london": branch: "london" - "kohn": @@ -74,12 +74,12 @@ cron: "" sbom-generator: true - gerrit-maven-docker-stage: + cron: "@daily" 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 -Pdocker" maven-versions-plugin: true - cron: "@daily" - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g @@ -111,7 +111,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "sdnc/apps" project-name: "sdnc-apps" @@ -138,12 +137,3 @@ mvn-version: "mvn38" mvn-settings: "sdnc-apps-settings" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" - -- project: - name: sdnc-apps-info - project-name: sdnc-apps - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: sdnc/apps - branch: master diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml index acb2ceeeb..6aa2b53f5 100644 --- a/jjb/sdnc/sdnc-csit.yaml +++ b/jjb/sdnc/sdnc-csit.yaml @@ -15,6 +15,8 @@ stream: - "master": branch: "master" + - "montreal": + branch: "montreal" - "london": branch: "london" - "kohn": diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 2ef7de91e..0b8c14d3c 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -5,7 +5,6 @@ jobs: - gerrit-maven-verify - gerrit-maven-merge: - cron: "@daily" - gerrit-maven-stage: sign-artifacts: true build-node: centos8-docker-8c-8g @@ -35,7 +34,43 @@ nexus-snapshot-repo: "snapshots" - project: - name: sdnc-northbound-java17 + name: sdnc-northbound-released-java17 + project-name: "sdnc-northbound" + jobs: + - gerrit-maven-verify + - gerrit-maven-merge: + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos8-docker-8c-8g + cron: "" + sbom-generator: true + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + + project: "sdnc/northbound" + stream: + - "montreal": + branch: "montreal" + - "london": + branch: "london" + java-version: openjdk17 + mvn-version: "mvn38" + mvn-settings: "sdnc-northbound-settings" + + # due to a strange macro / variable translation problem this needs to be + # passed as a string block to properly get the properties correctly defined + # in the job + maven-deploy-properties: | + deployAtEnd=true + files: "**" + archive-artifacts: "" + maven-version: "mvn38" + build-node: ubuntu1804-builder-4c-4g + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + +- project: + name: sdnc-northbound-current-java17 project-name: "sdnc-northbound" jobs: - gerrit-maven-verify @@ -53,8 +88,6 @@ stream: - "master": branch: "master" - - "london": - branch: "london" java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "sdnc-northbound-settings" @@ -79,7 +112,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "sdnc/northbound" project-name: "sdnc-northbound" @@ -105,12 +137,3 @@ java-version: openjdk17 mvn-version: "mvn38" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" - -- project: - name: sdnc-northbound-info - project-name: sdnc-northbound - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: sdnc/northbound - branch: master diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 901dc31bb..cbf4864eb 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -6,7 +6,6 @@ - gerrit-maven-verify: cron: "" - gerrit-maven-merge: - cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: build-node: centos8-docker-8c-8g @@ -20,7 +19,6 @@ container-staging-registry: "nexus3.onap.org:10003" mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker" maven-versions-plugin: true - cron: "@daily" - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g project: "sdnc/oam" @@ -39,13 +37,12 @@ nexus-snapshot-repo: "snapshots" - project: - name: sdnc-oam-java17 + name: sdnc-oam-released-java17 project-name: "sdnc-oam" jobs: - gerrit-maven-verify: cron: "" - gerrit-maven-merge: - cron: "@daily" mvn-params: "-Dmaven.test.skip=true" - gerrit-maven-stage: build-node: centos8-docker-8c-8g @@ -59,15 +56,53 @@ container-staging-registry: "nexus3.onap.org:10003" mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker" maven-versions-plugin: true + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + project: "sdnc/oam" + stream: + - "montreal": + branch: "montreal" + - "london": + branch: "london" + java-version: openjdk17 + mvn-version: "mvn38" + mvn-settings: "sdnc-oam-settings" + files: "**" + archive-artifacts: "" + sign-artifacts: true + build-node: centos8-docker-8c-8g + shallow-clone: true + mvn-snapshot-id: "ecomp-snapshots" + nexus-snapshot-repo: "snapshots" + +- project: + name: sdnc-oam-current-java17 + project-name: "sdnc-oam" + jobs: + - gerrit-maven-verify: + cron: "" + - gerrit-maven-merge: + cron: "@daily" + mvn-params: "-Dmaven.test.skip=true" + - gerrit-maven-stage: + build-node: centos8-docker-8c-8g + sign-artifacts: true + mvn-params: "-Dmaven.test.skip=true" + cron: "" + sbom-generator: true + - gerrit-maven-docker-stage: cron: "@daily" + build-node: centos8-docker-8c-8g + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + mvn-params: "-Dmaven.test.skip=true -Ddocker.skip.run=true -Pdocker" + maven-versions-plugin: true - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g project: "sdnc/oam" stream: - "master": branch: "master" - - "london": - branch: "london" java-version: openjdk17 mvn-version: "mvn38" mvn-settings: "sdnc-oam-settings" @@ -94,12 +129,3 @@ java-version: openjdk17 mvn-version: "mvn38" mvn-opts: "--add-opens=java.base/java.util=ALL-UNNAMED" - -- project: - name: sdnc-oam-info - project-name: sdnc-oam - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: sdnc/oam - branch: master diff --git a/jjb/so/so-adapters-so-cnf-adapter.yaml b/jjb/so/so-adapters-so-cnf-adapter.yaml index 5189c46ee..d070ead29 100644 --- a/jjb/so/so-adapters-so-cnf-adapter.yaml +++ b/jjb/so/so-adapters-so-cnf-adapter.yaml @@ -6,14 +6,6 @@ - project-view - project: - name: so-adapters-so-cnf-adapter-info - project: so/adapters/so-cnf-adapter - project-name: so-adapters-so-cnf-adapter - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: so-adapters-so-cnf-adapter project-name: "so-adapters-so-cnf-adapter" jobs: @@ -52,7 +44,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" max-git-repo-age-hours: 48 build-node: ubuntu1804-docker-v1-8c-8g project: "so/adapters/so-cnf-adapter" diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml index 372955916..1f739a6b1 100644 --- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml @@ -6,14 +6,6 @@ - project-view - project: - 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: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: so-adapters-so-etsi-sol003-adapter project-name: "so-adapters-so-etsi-sol003-adapter" jobs: @@ -55,7 +47,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" max-git-repo-age-hours: 48 build-node: ubuntu1804-docker-v1-8c-8g project: "so/adapters/so-etsi-sol003-adapter" diff --git a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml index 0c75367fb..6175f78aa 100644 --- a/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol005-adapter.yaml @@ -6,14 +6,6 @@ - project-view - project: - 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: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: so-adapters-so-etsi-sol005-adapter project-name: "so-adapters-so-etsi-sol005-adapter" jobs: @@ -52,7 +44,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" max-git-repo-age-hours: 48 build-node: ubuntu1804-docker-v1-8c-8g project: "so/adapters/so-etsi-sol005-adapter" diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml index e6c35462f..9a469538a 100644 --- a/jjb/so/so-adapters-so-nssmf-adapter.yaml +++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml @@ -6,14 +6,6 @@ - project-view - project: - name: so-adapters-so-nssmf-adapter-info - project: so/adapters/so-nssmf-adapter - project-name: so-adapters-so-nssmf-adapter - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: so-adapters-so-nssmf-adapter project-name: "so-adapters-so-nssmf-adapter" jobs: @@ -58,7 +50,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" max-git-repo-age-hours: 48 build-node: ubuntu1804-docker-v1-8c-8g project: "so/adapters/so-nssmf-adapter" diff --git a/jjb/so/so-adapters-so-oof-adapter.yaml b/jjb/so/so-adapters-so-oof-adapter.yaml index 16d0a5822..3439c67d1 100644 --- a/jjb/so/so-adapters-so-oof-adapter.yaml +++ b/jjb/so/so-adapters-so-oof-adapter.yaml @@ -6,14 +6,6 @@ - project-view - project: - name: so-adapters-so-oof-adapter-info - project: so/adapters/so-oof-adapter - project-name: so-adapters-so-oof-adapter - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: so-adapters-so-oof-adapter project-name: "so-adapters-so-oof-adapter" jobs: @@ -52,7 +44,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" max-git-repo-age-hours: 48 build-node: ubuntu1804-docker-v1-8c-8g project: "so/adapters/so-oof-adapter" diff --git a/jjb/so/so-libs.yaml b/jjb/so/so-libs.yaml index b5b11ed6a..c5e142169 100644 --- a/jjb/so/so-libs.yaml +++ b/jjb/so/so-libs.yaml @@ -35,7 +35,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "so/libs" project-name: "so-libs" @@ -54,13 +53,3 @@ project-name: "so-libs" branch: "master" mvn-settings: "so-libs-settings" - -- project: - name: so-libs-info - project-name: so-libs - java-version: openjdk11 - jobs: - - gerrit-info-yaml-verify - 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 fec0a4b21..ac43022cb 100644 --- a/jjb/so/so-so-admin-cockpit.yaml +++ b/jjb/so/so-so-admin-cockpit.yaml @@ -6,14 +6,6 @@ - project-view - project: - name: so-so-admin-cockpit-info - project: so/so-admin-cockpit - project-name: so-so-admin-cockpit - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: so-so-admin-cockpit project-name: "so-so-admin-cockpit" jobs: @@ -52,7 +44,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" max-git-repo-age-hours: 48 build-node: ubuntu1804-docker-v1-8c-8g project: "so/so-admin-cockpit" @@ -67,7 +58,6 @@ java-version: openjdk11 jobs: - "onap-gerrit-maven-coverity" - cron: "@daily" build-node: "ubuntu1804-docker-v1-8c-8g" project: "so/so-admin-cockpit" project-name: "so-so-admin-cockpit" diff --git a/jjb/so/so-so-etsi-nfvo.yaml b/jjb/so/so-so-etsi-nfvo.yaml index 4738935bd..8a238587b 100644 --- a/jjb/so/so-so-etsi-nfvo.yaml +++ b/jjb/so/so-so-etsi-nfvo.yaml @@ -6,14 +6,6 @@ - project-view - project: - name: so-so-etsi-nfvo-info - project: so/so-etsi-nfvo - project-name: so-so-etsi-nfvo - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: so-so-etsi-nfvo project-name: "so-so-etsi-nfvo" jobs: @@ -52,7 +44,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" max-git-repo-age-hours: 48 build-node: ubuntu1804-docker-v1-8c-8g project: "so/so-etsi-nfvo" diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 1ede07224..4eda33bf7 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -54,7 +54,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" max-git-repo-age-hours: 48 build-node: ubuntu1804-docker-v1-8c-8g project: "so" @@ -69,7 +68,6 @@ java-version: openjdk11 jobs: - "onap-gerrit-maven-coverity" - cron: "@daily" build-node: "ubuntu1804-docker-v1-8c-8g" project: "so" project-name: "so" @@ -106,22 +104,3 @@ - "master": branch: "master" mvn-settings: "so-settings" - -- project: - name: so-info - project-name: so - java-version: openjdk11 - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: so - stream: - - "master": - branch: "master" - java-version: openjdk11 - - "london": - branch: "london" - java-version: openjdk11 - - "kohn": - branch: "kohn" - java-version: openjdk11 diff --git a/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml index 80e4a1b9f..50e2d5c66 100644 --- a/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml +++ b/jjb/testsuite/pythonsdk-tests/testsuite-pythonsdk-tests.yaml @@ -1,14 +1,5 @@ --- - project: - name: testsuite-pythonsdk-tests-info - project-name: testsuite-pythonsdk-tests - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: testsuite/pythonsdk-tests - branch: master - -- project: name: testsuite-pythonsdk-tests-linters project: "testsuite/pythonsdk-tests" project-name: "testsuite-pythonsdk-tests" diff --git a/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml b/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml index ea463b6f4..884d3168e 100644 --- a/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml +++ b/jjb/testsuite/robot-utils/testsuite-robot-utils.yaml @@ -4,11 +4,3 @@ project-name: testsuite-robot-utils views: - project-view - -- project: - name: testsuite-robot-utils-info - project: testsuite/robot-utils - project-name: testsuite-robot-utils - 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 6ac651190..356b9ad88 100644 --- a/jjb/testsuite/testsuite-cds-mock-odl.yaml +++ b/jjb/testsuite/testsuite-cds-mock-odl.yaml @@ -6,14 +6,6 @@ - project-view - project: - name: testsuite-cds-mock-odl-info - project: testsuite/cds-mock-odl - project-name: testsuite-cds-mock-odl - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: testsuite-cds-mock-odl-linters project: "testsuite/cds-mock-odl" project-name: "testsuite-cds-mock-odl" @@ -66,5 +58,4 @@ docker-root: "$WORKSPACE" mvn-settings: "testsuite-cds-mock-odl-settings" build-node: ubuntu1804-docker-8c-8g - cron: "@daily" container-tag-method: stream diff --git a/jjb/testsuite/testsuite-cds-mock-server.yaml b/jjb/testsuite/testsuite-cds-mock-server.yaml index e2aa1c6fb..fcd7a125e 100644 --- a/jjb/testsuite/testsuite-cds-mock-server.yaml +++ b/jjb/testsuite/testsuite-cds-mock-server.yaml @@ -6,14 +6,6 @@ - project-view - project: - name: testsuite-cds-mock-server-info - project: testsuite/cds-mock-server - project-name: testsuite-cds-mock-server - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: testsuite-cds-mock-server-linters project: "testsuite/cds-mock-server" project-name: "testsuite-cds-mock-server" diff --git a/jjb/testsuite/testsuite-cds-mock-ssh.yaml b/jjb/testsuite/testsuite-cds-mock-ssh.yaml index 1812bc797..dcbbbba4e 100644 --- a/jjb/testsuite/testsuite-cds-mock-ssh.yaml +++ b/jjb/testsuite/testsuite-cds-mock-ssh.yaml @@ -6,14 +6,6 @@ - project-view - project: - name: testsuite-cds-mock-ssh-info - project: testsuite/cds-mock-ssh - project-name: testsuite-cds-mock-ssh - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: testsuite-cds-mock-ssh-linters project: "testsuite/cds-mock-ssh" project-name: "testsuite-cds-mock-ssh" diff --git a/jjb/testsuite/testsuite-cds.yaml b/jjb/testsuite/testsuite-cds.yaml index ac699522a..a702f8ce8 100644 --- a/jjb/testsuite/testsuite-cds.yaml +++ b/jjb/testsuite/testsuite-cds.yaml @@ -1,13 +1,5 @@ --- - project: - name: testsuite-cds-info - project: testsuite/cds - project-name: testsuite-cds - build-node: centos8-builder-2c-1g - jobs: - - gerrit-info-yaml-verify - -- project: name: testsuite-cds-linters project: "testsuite/cds" project-name: "testsuite-cds" diff --git a/jjb/testsuite/testsuite-oom.yaml b/jjb/testsuite/testsuite-oom.yaml deleted file mode 100644 index a5b86f5fc..000000000 --- a/jjb/testsuite/testsuite-oom.yaml +++ /dev/null @@ -1,9 +0,0 @@ ---- -- project: - name: testsuite-oom - project-name: testsuite-oom - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: testsuite/oom - branch: master diff --git a/jjb/testsuite/testsuite-python-testing-utils.yaml b/jjb/testsuite/testsuite-python-testing-utils.yaml index 69de692dc..fad72e486 100644 --- a/jjb/testsuite/testsuite-python-testing-utils.yaml +++ b/jjb/testsuite/testsuite-python-testing-utils.yaml @@ -34,12 +34,3 @@ pattern: "robotframework-onap/**" jobs: - "{project-name}-{stream}-{subproject}-verify-python" - -- project: - name: testsuite-python-testing-utils-info - project-name: testsuite-python-testing-utils - jobs: - - gerrit-info-yaml-verify - build-node: ubuntu1804-builder-4c-4g - project: testsuite/python-testing-utils - branch: master diff --git a/jjb/testsuite/testsuite.yaml b/jjb/testsuite/testsuite.yaml index 827aec93d..37096145c 100644 --- a/jjb/testsuite/testsuite.yaml +++ b/jjb/testsuite/testsuite.yaml @@ -29,15 +29,6 @@ mvn-settings: "testsuite-settings" - project: - name: testsuite-info - project-name: testsuite - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: testsuite - branch: master - -- project: name: testsuite-linters project: "testsuite" project-name: "testsuite" diff --git a/jjb/usecaseui/usecase-ui-intent-analysis.yaml b/jjb/usecaseui/usecase-ui-intent-analysis.yaml index fedf4a9d5..56d978b1f 100644 --- a/jjb/usecaseui/usecase-ui-intent-analysis.yaml +++ b/jjb/usecaseui/usecase-ui-intent-analysis.yaml @@ -6,10 +6,10 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" mvn-settings: "usecase-ui-intent-analysis-settings" jobs: - "{project-name}-{stream}-verify-java" @@ -27,7 +27,7 @@ container-staging-registry: "nexus3.onap.org:10003" - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - java-version: openjdk11 + java-version: openjdk17 files: "**" archive-artifacts: "" docker-pom: "pom.xml" @@ -41,13 +41,12 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "usecase-ui/intent-analysis" project-name: "usecase-ui-intent-analysis" branch: "master" mvn-settings: "usecase-ui-intent-analysis-settings" - java-version: openjdk11 + java-version: openjdk17 mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" @@ -63,13 +62,4 @@ - "master": branch: "master" mvn-settings: "usecase-ui-intent-analysis-settings" - java-version: openjdk11 - -- project: - name: usecase-ui-intent-analysis-info - project-name: usecase-ui-intent-analysis - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: usecase-ui/intent-analysis - branch: master + java-version: openjdk17 diff --git a/jjb/usecaseui/usecase-ui-llm-adaptation.yaml b/jjb/usecaseui/usecase-ui-llm-adaptation.yaml new file mode 100644 index 000000000..f99a603f7 --- /dev/null +++ b/jjb/usecaseui/usecase-ui-llm-adaptation.yaml @@ -0,0 +1,60 @@ +--- +- project: + name: usecase-ui-llm-adaptation + project-name: "usecase-ui-llm-adaptation" + project: "usecase-ui/llm-adaptation" + stream: + - "master": + branch: "master" + mvn-settings: "usecase-ui-llm-adaptation-settings" + jobs: + - "{project-name}-{stream}-verify-java" + - "{project-name}-{stream}-merge-java" + - gerrit-maven-stage: + sbom-generator: true + sign-artifacts: true + build-node: centos8-docker-4c-4g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + sbom-generator: true + build-node: ubuntu1804-docker-8c-8g + mvn-params: "-P docker -Dmaven.test.skip=true" + container-public-registry: "nexus3.onap.org:10001" + container-staging-registry: "nexus3.onap.org:10003" + - "{project-name}-gerrit-release-jobs": + build-node: centos7-docker-2c-1g + java-version: openjdk17 + files: "**" + archive-artifacts: "" + docker-pom: "pom.xml" + build-node: ubuntu1804-builder-4c-4g + +- project: + name: usecase-ui-llm-adaptation-sonar + jobs: + - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: "{sonarcloud_project_organization}" + sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" + sonar-mvn-goal: "{sonar_mvn_goal}" + build-node: ubuntu1804-builder-4c-4g + project: "usecase-ui/llm-adaptation" + project-name: "usecase-ui-llm-adaptation" + branch: "master" + mvn-settings: "usecase-ui-llm-adaptation-settings" + java-version: openjdk17 + mvn-goals: "clean install" + +- project: + name: usecase-ui-llm-adaptation-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: "onap-" + project: usecase-ui/llm-adaptation + project-name: "usecase-ui-llm-adaptation" + build-node: ubuntu1804-builder-4c-4g + stream: + - "master": + branch: "master" + mvn-settings: "usecase-ui-llm-adaptation-settings" + java-version: openjdk17 diff --git a/jjb/usecaseui/usecase-ui-nlp.yaml b/jjb/usecaseui/usecase-ui-nlp.yaml index 54cdeb8cb..5942089f3 100644 --- a/jjb/usecaseui/usecase-ui-nlp.yaml +++ b/jjb/usecaseui/usecase-ui-nlp.yaml @@ -6,10 +6,10 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" mvn-settings: "usecase-ui-nlp-settings" jobs: - "{project-name}-{stream}-verify-java" @@ -38,7 +38,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "usecase-ui/nlp" project-name: "usecase-ui-nlp" @@ -59,15 +58,6 @@ mvn-settings: "usecase-ui-nlp-settings" - project: - name: usecase-ui-nlp-info - project-name: usecase-ui-nlp - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: usecase-ui/nlp - branch: master - -- project: name: usecase-ui-nlp-project-view project-name: usecase-ui-nlp views: diff --git a/jjb/usecaseui/usecase-ui-server.yaml b/jjb/usecaseui/usecase-ui-server.yaml index 7ca69ce46..2b025388d 100644 --- a/jjb/usecaseui/usecase-ui-server.yaml +++ b/jjb/usecaseui/usecase-ui-server.yaml @@ -6,10 +6,10 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" mvn-settings: "usecase-ui-server-settings" jobs: - "{project-name}-{stream}-verify-java" @@ -19,16 +19,20 @@ sign-artifacts: true build-node: centos8-docker-4c-4g maven-versions-plugin: true + java-version: openjdk17 - "{project-name}-{stream}-docker-java-daily": mvn-params: "-Dmaven.test.skip=true" build-node: ubuntu1804-docker-8c-8g + java-version: openjdk17 - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g + java-version: openjdk17 files: "**" archive-artifacts: "" docker-pom: "pom.xml" mvn-profile: docker build-node: ubuntu1804-builder-4c-4g + java-version: openjdk17 - project: name: usecase-ui-server-sonar @@ -38,7 +42,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "usecase-ui/server" project-name: "usecase-ui-server" @@ -46,6 +49,7 @@ mvn-settings: "usecase-ui-server-settings" mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" + java-version: openjdk17 - project: name: usecase-ui-server-clm @@ -57,12 +61,4 @@ build-node: ubuntu1804-builder-4c-4g branch: "master" mvn-settings: "usecase-ui-server-settings" - -- project: - name: usecase-ui-server-info - project-name: usecase-ui-server - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: usecase-ui/server - branch: master + java-version: openjdk17 diff --git a/jjb/usecaseui/usecase-ui.yaml b/jjb/usecaseui/usecase-ui.yaml index dc7ed4f6a..fe53327ee 100644 --- a/jjb/usecaseui/usecase-ui.yaml +++ b/jjb/usecaseui/usecase-ui.yaml @@ -12,10 +12,10 @@ stream: - "master": branch: "master" - - "kohn": - branch: "kohn" - "london": branch: "london" + - "montreal": + branch: "montreal" mvn-settings: "usecase-ui-settings" jobs: - "{project-name}-{stream}-verify-java" @@ -46,12 +46,3 @@ build-node: ubuntu1804-builder-4c-4g branch: "master" mvn-settings: "usecase-ui-settings" - -- project: - name: usecase-ui-info - project-name: usecase-ui - jobs: - - gerrit-info-yaml-verify - 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 961289dec..3b6ba20bb 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -44,7 +44,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - cron: "@daily" mvn-params: "-f lcm/pom.xml" build-node: ubuntu1804-builder-4c-4g project: "vfc/gvnfm/vnflcm" @@ -64,12 +63,3 @@ build-node: centos8-redis-4c-4g branch: "master" mvn-settings: "vfc-gvnfm-vnflcm-settings" - -- project: - name: vfc-gvnfm-vnflcm-info - project-name: vfc-gvnfm-vnflcm - jobs: - - gerrit-info-yaml-verify - 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 3a892a931..805e6380d 100644 --- a/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfmgr-java.yaml @@ -38,7 +38,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - cron: "@daily" mvn-params: "-f mgr/pom.xml" build-node: ubuntu1804-builder-4c-4g project: "vfc/gvnfm/vnfmgr" @@ -58,12 +57,3 @@ build-node: ubuntu1804-builder-4c-4g branch: "master" mvn-settings: "vfc-gvnfm-vnfmgr-settings" - -- project: - name: vfc-gvnfm-vnfmgr-info - project-name: vfc-gvnfm-vnfmgr - jobs: - - gerrit-info-yaml-verify - 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 4c594578f..1b98218d9 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-java.yaml @@ -38,7 +38,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - cron: "@daily" mvn-params: "-f res/pom.xml" build-node: ubuntu1804-builder-4c-4g project: "vfc/gvnfm/vnfres" @@ -58,12 +57,3 @@ build-node: ubuntu1804-builder-4c-4g branch: "master" mvn-settings: "vfc-gvnfm-vnfres-settings" - -- project: - name: vfc-gvnfm-vnfres-info - project-name: vfc-gvnfm-vnfres - jobs: - - gerrit-info-yaml-verify - 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 d06c90d4f..8f755af30 100644 --- a/jjb/vfc/vfc-nfvo-db.yaml +++ b/jjb/vfc/vfc-nfvo-db.yaml @@ -23,12 +23,3 @@ build-node: ubuntu1804-docker-8c-8g - "{project-name}-gerrit-release-jobs": build-node: centos7-docker-2c-1g - -- project: - name: vfc-nfvo-db-info - project-name: vfc-nfvo-db - jobs: - - gerrit-info-yaml-verify - 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 259ab141e..edd796b12 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -37,7 +37,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g mvn-params: "-f huawei/pom.xml" project: "vfc/nfvo/driver/vnfm/svnfm" @@ -59,13 +58,3 @@ build-node: ubuntu1804-builder-4c-4g branch: "master" mvn-settings: "vfc-nfvo-driver-vnfm-svnfm-settings" - -- project: - name: vfc-nfvo-driver-svnfm-huawei-info - project-name: vfc-nfvo-driver-svnfm-huawei - java-version: openjdk11 - jobs: - - gerrit-info-yaml-verify - 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 4c9dba91e..0370b516f 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -40,7 +40,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - cron: "@daily" mvn-params: "-f gvnfmadapter/pom.xml" build-node: ubuntu1804-builder-4c-4g project: "vfc/nfvo/driver/vnfm/gvnfm" @@ -60,12 +59,3 @@ build-node: ubuntu1804-builder-4c-4g branch: "master" mvn-settings: "vfc-nfvo-driver-vnfm-gvnfm-settings" - -- project: - name: vfc-nfvo-driver-vnfm-gvnfm-info - project-name: vfc-nfvo-driver-vnfm-gvnfm - jobs: - - gerrit-info-yaml-verify - 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 fb2a0534c..03a903cbb 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -34,7 +34,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "vfc/nfvo/lcm" project-name: "vfc-nfvo-lcm" @@ -53,12 +52,3 @@ build-node: centos8-redis-4c-4g branch: "master" mvn-settings: "vfc-nfvo-lcm-settings" - -- project: - name: vfc-nfvo-lcm-info - project-name: vfc-nfvo-lcm - jobs: - - gerrit-info-yaml-verify - 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 8859c1660..c4ebb6260 100644 --- a/jjb/vnfrqts/vnfrqts-epics.yaml +++ b/jjb/vnfrqts/vnfrqts-epics.yaml @@ -4,13 +4,3 @@ project-name: vnfrqts views: - project-view - -- project: - name: vnfrqts-epics - project: "vnfrqts/epics" - jobs: - - gerrit-info-yaml-verify - 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 deleted file mode 100644 index 2615f4ff1..000000000 --- a/jjb/vnfrqts/vnfrqts-guidelines.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- project: - name: vnfrqts-guidelines - project: "vnfrqts/guidelines" - jobs: - - gerrit-info-yaml-verify - 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 ce4720f27..874160b1d 100644 --- a/jjb/vnfrqts/vnfrqts-requirements.yaml +++ b/jjb/vnfrqts/vnfrqts-requirements.yaml @@ -1,15 +1,5 @@ --- - project: - name: vnfrqts-requirements - project: "vnfrqts/requirements" - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project-name: "vnfrqts-requirements" - branch: "master" - mvn-settings: "vnfrqts-requirements-settings" - -- project: name: vnfrqts-requirements-upload-json project: "vnfrqts/requirements" project-name: "vnfrqts-requirements" diff --git a/jjb/vnfrqts/vnfrqts-testcases.yaml b/jjb/vnfrqts/vnfrqts-testcases.yaml deleted file mode 100644 index d094a86c7..000000000 --- a/jjb/vnfrqts/vnfrqts-testcases.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- project: - name: vnfrqts-testcases - project: "vnfrqts/testcases" - jobs: - - gerrit-info-yaml-verify - 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 deleted file mode 100644 index 61c8be77c..000000000 --- a/jjb/vnfrqts/vnfrqts-usecases.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- project: - name: vnfrqts-usecases - project: "vnfrqts/usecases" - jobs: - - gerrit-info-yaml-verify - 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 190f23e65..db305382b 100644 --- a/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml +++ b/jjb/vnfsdk/vnfsdk-dovetail-integration-python.yaml @@ -36,7 +36,6 @@ name: vnfsdk-dovetail-integration-tox-sonar jobs: - gerrit-tox-sonar - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "vnfsdk/dovetail-integration" project-name: "vnfsdk-dovetail-integration" @@ -46,15 +45,6 @@ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: - name: vnfsdk-dovetail-integration-info - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: "vnfsdk/dovetail-integration" - project-name: "vnfsdk-dovetail-integration" - branch: "master" - -- project: name: vnfsdk-dovetail-integration-clm jobs: - gerrit-maven-clm diff --git a/jjb/vnfsdk/vnfsdk-functest.yaml b/jjb/vnfsdk/vnfsdk-functest.yaml index 327650a19..234239c66 100644 --- a/jjb/vnfsdk/vnfsdk-functest.yaml +++ b/jjb/vnfsdk/vnfsdk-functest.yaml @@ -21,15 +21,6 @@ build-node: ubuntu1804-builder-4c-4g - project: - name: vnfsdk-functest-info - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: "vnfsdk/functest" - project-name: "vnfsdk-functest" - branch: "master" - -- project: name: vnfsdk-functest-clm jobs: - gerrit-maven-clm diff --git a/jjb/vnfsdk/vnfsdk-lctest.yaml b/jjb/vnfsdk/vnfsdk-lctest.yaml index 266804ed9..f8213338a 100644 --- a/jjb/vnfsdk/vnfsdk-lctest.yaml +++ b/jjb/vnfsdk/vnfsdk-lctest.yaml @@ -10,12 +10,3 @@ - "master": branch: "master" mvn-settings: "vnfsdk-lctest-settings" - -- project: - name: vnfsdk-lctest-info - jobs: - - gerrit-info-yaml-verify - 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 deleted file mode 100644 index 59cf6eefb..000000000 --- a/jjb/vnfsdk/vnfsdk-model.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- project: - name: vnfsdk-model - project: "vnfsdk/model" - jobs: - - gerrit-info-yaml-verify - 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 8015f0340..29c7201be 100644 --- a/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml +++ b/jjb/vnfsdk/vnfsdk-pkgtools-python.yaml @@ -24,7 +24,6 @@ name: vnfsdk-pkgtools-tox-sonar jobs: - gerrit-tox-sonar - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "vnfsdk/pkgtools" project-name: "vnfsdk-pkgtools" @@ -32,12 +31,3 @@ mvn-settings: "vnfsdk-pkgtools-settings" mvn-goals: "clean install" mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - -- project: - name: vnfsdk-pkgtools-info - jobs: - - gerrit-info-yaml-verify - 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 c7f266a6c..5abc17fd5 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -38,7 +38,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "vnfsdk/refrepo" project-name: "vnfsdk-refrepo" @@ -48,15 +47,6 @@ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: - name: vnfsdk-refrepo-info - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: "vnfsdk/refrepo" - project-name: "vnfsdk-refrepo" - branch: "master" - -- project: name: vnfsdk-refrepo-clm java-version: openjdk11 jobs: diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index 33b311004..0f88445ed 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -31,7 +31,6 @@ sonarcloud-project-organization: "{sonarcloud_project_organization}" sonarcloud-project-key: "{sonarcloud_project_organization}_{project-name}" sonar-mvn-goal: "{sonar_mvn_goal}" - cron: "@daily" build-node: ubuntu1804-builder-4c-4g project: "vnfsdk/validation" project-name: "vnfsdk-validation" @@ -41,15 +40,6 @@ mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m" - project: - name: vnfsdk-validation-info - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - project: "vnfsdk/validation" - project-name: "vnfsdk-validation" - branch: "master" - -- project: name: vnfsdk-validation-clm java-version: openjdk11 jobs: diff --git a/jjb/vvp/vvp-documentation.yaml b/jjb/vvp/vvp-documentation.yaml deleted file mode 100644 index 2df897d6c..000000000 --- a/jjb/vvp/vvp-documentation.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- project: - name: vvp-documentation - project-name: "vvp-documentation" - project: "vvp/documentation" - mvn-settings: "vvp-documentation-settings" - branch: master - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g diff --git a/jjb/vvp/vvp-em.yaml b/jjb/vvp/vvp-em.yaml deleted file mode 100644 index 99c040943..000000000 --- a/jjb/vvp/vvp-em.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- project: - name: vvp-engagementmgr - project-name: "vvp-engagementmgr" - project: "vvp/engagementmgr" - mvn-settings: "vvp-engagementmgr-settings" - branch: master - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g diff --git a/jjb/vvp/vvp-oom.yaml b/jjb/vvp/vvp-oom.yaml deleted file mode 100644 index 3da6dcd30..000000000 --- a/jjb/vvp/vvp-oom.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- project: - name: vvp-oom - project-name: "vvp-oom" - project: "vvp/oom" - mvn-settings: "vvp-oom-settings" - branch: master - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g diff --git a/jjb/vvp/vvp-regression.yaml b/jjb/vvp/vvp-regression.yaml deleted file mode 100644 index 265d70f7f..000000000 --- a/jjb/vvp/vvp-regression.yaml +++ /dev/null @@ -1,10 +0,0 @@ ---- -- project: - name: vvp-regression-tests - project-name: "vvp-regression-tests" - project: "vvp/regression-tests" - mvn-settings: "vvp-regression-tests-settings" - branch: master - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g diff --git a/jjb/vvp/vvp-test-engine.yaml b/jjb/vvp/vvp-test-engine.yaml index e9be3d35e..8287c4811 100644 --- a/jjb/vvp/vvp-test-engine.yaml +++ b/jjb/vvp/vvp-test-engine.yaml @@ -1,15 +1,5 @@ --- - project: - name: vvp-test-engine-info - project-name: "vvp-test-engine" - project: "vvp/test-engine" - mvn-settings: "vvp-test-engine-settings" - branch: master - jobs: - - gerrit-info-yaml-verify - build-node: centos8-builder-2c-1g - -- project: name: vvp-test-engine-sonar jobs: - gerrit-maven-sonar @@ -17,7 +7,6 @@ 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: "vvp/test-engine" project-name: "vvp-test-engine" diff --git a/jjb/vvp/vvp-validation-scripts.yaml b/jjb/vvp/vvp-validation-scripts.yaml index d6539996f..4e7f45f5d 100644 --- a/jjb/vvp/vvp-validation-scripts.yaml +++ b/jjb/vvp/vvp-validation-scripts.yaml @@ -29,7 +29,6 @@ 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: "vvp/validation-scripts" project-name: "vvp-validation-scripts" diff --git a/packer/common-packer b/packer/common-packer -Subproject 09cb3bcf48185afdc5af0a548be904491ae215d +Subproject c999f1fa39bfd954cdc2d8aa85b6c5c972842f8 |