From: Bengt Thuree Date: Tue, 19 Apr 2022 02:14:59 +0000 (+0000) Subject: Merge "Fix: Add HELM credentials to oom-settings" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=5c00cf67f8145a5b36e2c7b5e8b3f24a6f53e049;hp=a2fda26ee60efb34bb95d145ec352c1222a3c249;p=ci-management.git Merge "Fix: Add HELM credentials to oom-settings" --- diff --git a/global-jjb b/global-jjb index 77f06cb5e..fca0db4eb 160000 --- a/global-jjb +++ b/global-jjb @@ -1 +1 @@ -Subproject commit 77f06cb5e687962c7f999c80fbcf2a6b31042afd +Subproject commit fca0db4ebfaa82e0acbdfc9310141f5750e532b2 diff --git a/jenkins-config/managed-config-files/mavenSettings/modeling-toscaparsers-settings/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/modeling-toscaparsers-settings/config-params.yaml deleted file mode 100644 index d52c73c74..000000000 --- a/jenkins-config/managed-config-files/mavenSettings/modeling-toscaparsers-settings/config-params.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- -name: "modeling-toscaparsers-settings" -comment: "modeling-toscaparsers-settings" diff --git a/jenkins-config/managed-config-files/mavenSettings/modeling-toscaparsers-settings/content b/jenkins-config/managed-config-files/mavenSettings/modeling-toscaparsers-settings/content deleted file mode 120000 index e830ebdd5..000000000 --- a/jenkins-config/managed-config-files/mavenSettings/modeling-toscaparsers-settings/content +++ /dev/null @@ -1 +0,0 @@ -../../../managed-config-templates/mavenSettings-content \ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/modeling-toscaparsers-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/modeling-toscaparsers-settings/serverCredentialMappings.sandbox.yaml deleted file mode 120000 index 8f9205792..000000000 --- a/jenkins-config/managed-config-files/mavenSettings/modeling-toscaparsers-settings/serverCredentialMappings.sandbox.yaml +++ /dev/null @@ -1 +0,0 @@ -../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml \ No newline at end of file diff --git a/jenkins-config/managed-config-files/mavenSettings/modeling-toscaparsers-settings/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/modeling-toscaparsers-settings/serverCredentialMappings.yaml deleted file mode 100644 index a4b0ac64d..000000000 --- a/jenkins-config/managed-config-files/mavenSettings/modeling-toscaparsers-settings/serverCredentialMappings.yaml +++ /dev/null @@ -1,18 +0,0 @@ ---- -serverCredentialMappings: - - serverId: "ecomp-snapshots" - credentialsId: &cred "modeling-toscaparsers" - - 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/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index 775f85648..2044e818c 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/apps.yaml @@ -34,6 +34,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-apps-settings' @@ -80,6 +82,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-apps-settings' diff --git a/jjb/ccsdk/ccsdk-csit.yaml b/jjb/ccsdk/ccsdk-csit.yaml index c8af14cbd..ead2542bf 100644 --- a/jjb/ccsdk/ccsdk-csit.yaml +++ b/jjb/ccsdk/ccsdk-csit.yaml @@ -15,10 +15,10 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'ccsdk-distribution-settings' robot-options: '' branch: 'master' @@ -37,10 +37,10 @@ stream: - 'master': branch: 'master' - - 'honolulu': - branch: 'honolulu' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'ccsdk-oran-settings' robot-options: '' branch: 'master' diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index 5a6150663..88ccf2ee9 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -29,6 +29,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-oran-settings' @@ -52,6 +54,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-oran-settings' diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index f0fd25f67..f0870f62d 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -28,6 +28,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-cds-settings' @@ -113,6 +115,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-cds-settings' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 4a24dd29d..265a69636 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -30,6 +30,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-distribution-settings' @@ -71,6 +73,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-distribution-settings' diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index ba34b88d6..27bddebd0 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -22,6 +22,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-features-settings' @@ -69,6 +71,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-features-settings' diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index d3d780c2f..13976b7bf 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -33,6 +33,8 @@ mvn-params: '-Drevision=3.0.0' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-parent-settings' @@ -56,6 +58,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-parent-settings' diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml index 34f56cdc7..f0ac46b6a 100644 --- a/jjb/ccsdk/sli.yaml +++ b/jjb/ccsdk/sli.yaml @@ -22,6 +22,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-settings' @@ -68,6 +70,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-version: 'mvn36' mvn-settings: 'ccsdk-sli-settings' diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index 3f182ec90..bc9455641 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -100,3 +100,23 @@ build-node: centos7-builder-2c-1g project: cli branch: master + +- project: + name: cli-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-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: '{sonar_mvn_goal}' + build-node: ubuntu1804-docker-8c-8g + project: 'cli' + project-name: 'cli' + branch: 'master' + mvn-settings: 'cli-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/cps/cps-cps-tbdmt.yaml b/jjb/cps/cps-cps-tbdmt.yaml index fd3aae010..4bfbe3ed2 100644 --- a/jjb/cps/cps-cps-tbdmt.yaml +++ b/jjb/cps/cps-cps-tbdmt.yaml @@ -74,9 +74,30 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: centos7-docker-8c-8g - project: cps/cps-tbdmt - project-name: cps-cps-tbdmt + 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 + mvn-version: "mvn36" + maven-version: "mvn36" + jobs: + - gerrit-maven-sonar-verify + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonarcloud-qualitygate-wait: true + sonar-mvn-goal: '{sonar_mvn_goal}' + build-node: centos7-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' diff --git a/jjb/cps/cps-cps-temporal-csit.yaml b/jjb/cps/cps-cps-temporal-csit.yaml index 1dbd0626c..83c1cc377 100644 --- a/jjb/cps/cps-cps-temporal-csit.yaml +++ b/jjb/cps/cps-cps-temporal-csit.yaml @@ -4,10 +4,10 @@ jobs: - '{project-name}-review-verification-maven-{stream}': mvn-goals: clean install - mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push=' + 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=' + mvn-params: '-Dmaven.test.skip=true -Ddocker.repository.push= -Pdocker' project-name: 'cps-cps-temporal' recipients: 'toine.siebelink@est.tech' # project name in gerrit diff --git a/jjb/cps/cps-cps-temporal.yaml b/jjb/cps/cps-cps-temporal.yaml index d7b4ebcac..3defa769e 100644 --- a/jjb/cps/cps-cps-temporal.yaml +++ b/jjb/cps/cps-cps-temporal.yaml @@ -42,6 +42,9 @@ - 'istanbul': branch: 'istanbul' cron: '' + - 'jakarta': + branch: 'jakarta' + cron: '' mvn-settings: cps-cps-temporal-settings files: '**' archive-artifacts: '' @@ -75,10 +78,31 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: centos7-docker-8c-8g - project: cps/cps-temporal - project-name: cps-cps-temporal - branch: master - mvn-settings: cps-cps-temporal-settings + 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-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonarcloud-qualitygate-wait: true + sonar-mvn-goal: '{sonar_mvn_goal}' + build-node: centos7-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-ncmp-dmi-plugin-csit.yaml b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml new file mode 100644 index 000000000..86ff13c60 --- /dev/null +++ b/jjb/cps/cps-ncmp-dmi-plugin-csit.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: cps-ncmp-dmi-plugin-csit + 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: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' + 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 c7f6a5d85..3a47d4bde 100644 --- a/jjb/cps/cps-ncmp-dmi-plugin.yaml +++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml @@ -44,6 +44,9 @@ - 'istanbul': branch: 'istanbul' cron: '' + - 'jakarta': + branch: 'jakarta' + cron: '' mvn-settings: cps-ncmp-dmi-plugin-settings files: '**' archive-artifacts: '' @@ -77,10 +80,31 @@ sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: centos7-docker-8c-8g - project: cps/ncmp-dmi-plugin - project-name: cps-ncmp-dmi-plugin - branch: master - mvn-settings: cps-ncmp-dmi-plugin-settings + project: 'cps/ncmp-dmi-plugin' + project-name: 'cps-ncmp-dmi-plugin' + branch: 'master' + mvn-settings: 'cps-ncmp-dmi-plugin-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: cps-ncmp-dmi-plugin-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-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonarcloud-qualitygate-wait: true + sonar-mvn-goal: '{sonar_mvn_goal}' + build-node: centos7-docker-8c-8g + project: 'cps/ncmp-dmi-plugin' + project-name: 'cps-ncmp-dmi-plugin' + branch: 'master' + mvn-settings: 'cps-ncmp-dmi-plugin-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml index f618d3db7..f6049664c 100644 --- a/jjb/cps/cps.yaml +++ b/jjb/cps/cps.yaml @@ -57,6 +57,9 @@ - 'istanbul': branch: 'istanbul' cron: '' + - 'jakarta': + branch: 'jakarta' + cron: '' mvn-settings: 'cps-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml index 06c1505a3..799fd7842 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-snmptrap.yaml @@ -15,7 +15,8 @@ build-node: ubuntu1804-docker-8c-8g mvn-settings: 'dcaegen2-collectors-snmptrap-settings' jobs: - - '{project-name}-python-jobs' + - '{project-name}-python-jobs': + pre-build-script: !include-raw-escape: ../../shell/onap-gerrit-review-wrapper.sh - '{project-name}-{stream}-release-version-java-daily' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g diff --git a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml index 4a4f21fe0..7fa8ef5f1 100644 --- a/jjb/dcaegen2/dcaegen2-collectors-ves.yaml +++ b/jjb/dcaegen2/dcaegen2-collectors-ves.yaml @@ -8,6 +8,7 @@ - '{project-name}-{stream}-merge-java' - gerrit-maven-stage: sign-artifacts: false + sbom-generator: true build-node: ubuntu1804-docker-8c-8g maven-versions-plugin: true - gerrit-maven-docker-stage: diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index 394a920d7..8320488f9 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -95,8 +95,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' mvn-settings: 'dmaap-messagerouter-messageservice-settings' java-version: openjdk11 diff --git a/jjb/doc/doc-install-plantuml.sh b/jjb/doc/doc-install-plantuml.sh deleted file mode 100644 index 0f5aedda5..000000000 --- a/jjb/doc/doc-install-plantuml.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash -set -x -if [ ! -d /usr/share/plantuml ] - then - sudo mkdir -p /usr/share/plantuml - cd /usr/share/plantuml - sudo wget https://nexus.onap.org/service/local/repositories/central/content/net/sourceforge/plantuml/plantuml/8059/plantuml-8059.jar - sudo mv plantuml-8059.jar plantuml.jar - fi - -if [ ! -f /usr/bin/plantuml ] - then - sudo touch /usr/bin/plantuml - sudo chmod +w /usr/bin/plantuml - echo "#!/bin/bash" > /tmp/x.$$ - echo "java -jar /usr/share/plantuml/plantuml.jar \$@" >> /tmp/x.$$ - sudo cp /tmp/x.$$ /usr/bin/plantuml - sudo chmod +x /usr/bin/plantuml - fi diff --git a/jjb/doc/doc-post-rtd.sh b/jjb/doc/doc-post-rtd.sh deleted file mode 100644 index 78b8d0b56..000000000 --- a/jjb/doc/doc-post-rtd.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash -if [ "$GERRIT_BRANCH" == "master" ]; then - RTD_BUILD_VERSION=latest -else - RTD_BUILD_VERSION="${{GERRIT_BRANCH/\//-}}" -fi - -# shellcheck disable=SC1083 -curl -X POST \ - -d "branches=$RTD_BUILD_VERSION" \ - -d "token=$DOCS_RTD_TOKEN" \ - https://readthedocs.org/api/v2/webhook/{rtdproject} diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml deleted file mode 100644 index d4e542404..000000000 --- a/jjb/doc/doc-templates-rtd.yaml +++ /dev/null @@ -1,162 +0,0 @@ ---- -- job-template: - # Job template for verifying Sphinx/Restructured Text for RTD - # - # The purpose of this job template is verify documentation source - # - # Required Variables: - # branch: git branch - # Optional Variables: - # path: directory containing the project's tox.ini relative to - # the workspace. The default is the project root. - - name: '{project-name}-{stream}-verify-rtd' - path: '$WORKSPACE' - - project-type: freestyle - concurrent: true - node: '{build-node}' - - properties: - - infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - maven-exec: - maven-version: '{maven-version}' - - scm: - - git: - credentials-id: '{jenkins-ssh-credential}' - url: '$GIT_BASE' - refspec: '' - choosing-strategy: 'default' - branches: - - 'refs/heads/{branch}' - skip-tag: true - wipe-workspace: true - submodule: - recursive: '{submodule-recursive}' - timeout: '24' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - - gerrit-trigger-patch-submitted: - server: '{server-name}' - project: '**' - branch: '{branch}' - files: 'docs/**/*.rst' - - timed: 'H H * * *' - - builders: - - shell: | - if [ "$GERRIT_PROJECT" != "doc" ]; then - if [ -d docs/submodules/$GERRIT_PROJECT.git ]; then - cd docs/submodules/$GERRIT_PROJECT.git - else - cd docs/submodules/$GERRIT_PROJECT - fi - git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD - else - git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD - fi - - shell: !include-raw: doc-install-plantuml.sh - - shell: | - #!/bin/bash - python3 -m venv $WORKSPACE/venv-tox - source $WORKSPACE/venv-tox/bin/activate - pip install --upgrade pip - pip install --upgrade tox argparse - pip freeze - cd $WORKSPACE/{path} - tox - mkdir -p "$WORKSPACE/archives" - mv docs/_build/html "$WORKSPACE/archives/" - - publishers: - - lf-infra-publish - -- job-template: - # Job template for merging/publishing Sphinx/Restructured Text at RTD - # - # The purpose of this job template is to trigger updates after - # a merge of documentation source in gerrit - # - # Required Variables: - # branch: git branch - # rtdproject: name of a project at readthedocs.io - # Optional Variables: - # path: directory containing the project's tox.ini relative to - # the workspace. The default is the project root. - - name: '{project-name}-{stream}-merge-rtd' - path: '$WORKSPACE' - - project-type: freestyle - concurrent: false - node: '{build-node}' - - properties: - - infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - maven-exec: - maven-version: '{maven-version}' - - scm: - - git: - credentials-id: '{jenkins-ssh-credential}' - url: '$GIT_BASE' - refspec: '' - choosing-strategy: 'default' - branches: - - 'refs/heads/{branch}' - skip-tag: true - wipe-workspace: true - submodule-recursive: '{submodule-recursive}' - - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - credentials-binding: - - text: - credential-id: docs-token - variable: DOCS_RTD_TOKEN - - triggers: - - gerrit: - server-name: '{server-name}' - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: '**' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' - file-paths: - - compare-type: ANT - pattern: docs/**/*.rst - - builders: - - shell: !include-raw: doc-post-rtd.sh - - publishers: - - lf-infra-publish diff --git a/jjb/doc/doc.yaml b/jjb/doc/doc.yaml index f9f2cf267..ad3cea7e0 100644 --- a/jjb/doc/doc.yaml +++ b/jjb/doc/doc.yaml @@ -5,22 +5,6 @@ views: - project-view -- project: - name: doc - project-name: 'doc' - python-version: python3 - jobs: - - '{project-name}-{stream}-verify-rtd': - build-node: centos7-docker-8c-8g - - '{project-name}-{stream}-merge-rtd' - - project: 'doc' - rtdproject: 'onap/58810/' - mvn-settings: 'doc-settings' - stream: - - frankfurt: - branch: 'frankfurt' - - project: name: doc-info project-name: doc diff --git a/jjb/externalapi/externalapi-nbi.yaml b/jjb/externalapi/externalapi-nbi.yaml new file mode 100644 index 000000000..6bda3cba0 --- /dev/null +++ b/jjb/externalapi/externalapi-nbi.yaml @@ -0,0 +1,94 @@ +--- +- project: + name: externalapi-project-view + project-name: externalapi + views: + - project-view + +- project: + name: externalapi-nbi + project-name: 'externalapi-nbi' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-Dmaven.test.skip=true' + - gerrit-maven-docker-stage: + 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}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + project: 'externalapi/nbi' + stream: + - 'master': + branch: 'master' + mvn-settings: 'externalapi-nbi-settings' + java-version: openjdk11 + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-builder-4c-4g + +- project: + name: externalapi-nbi-arm64 + project-name: 'externalapi-nbi-arm64' + jobs: + - '{project-name}-{stream}-docker-version-java-daily': + docker-pom: 'pom.xml' + mvn-profile: 'docker' + mvn-params: '-Dmaven.test.skip=true' + build-node: 'ubuntu1804-docker-arm64-4c-2g' + project: 'externalapi/nbi' + stream: + - 'master': + branch: 'master' + mvn-settings: 'externalapi-nbi-settings' + files: '**' + archive-artifacts: '' + +- project: + name: externalapi-nbi-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'externalapi/nbi' + project-name: 'externalapi-nbi' + stream: + - 'master': + branch: 'master' + mvn-settings: 'externalapi-nbi-settings' + java-version: openjdk11 + +- project: + name: externalapi-nbi-sonar + jobs: + - gerrit-maven-sonar-prescan-script + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: '{sonar_mvn_goal}' + cron: '@daily' + build-node: ubuntu1804-builder-4c-4g + project: 'externalapi/nbi' + project-name: 'externalapi-nbi' + branch: 'master' + mvn-settings: 'externalapi-nbi-settings' + mvn-goals: 'clean install' + 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: centos7-builder-2c-1g + project: externalapi/nbi + branch: master diff --git a/jjb/global-defaults.yaml b/jjb/global-defaults.yaml index e29f27883..f28569896 100644 --- a/jjb/global-defaults.yaml +++ b/jjb/global-defaults.yaml @@ -59,7 +59,7 @@ # SonarCloud sonarcloud_project_organization: onap sonarcloud_api_token: da97604dfdc36ec82488a97ebea96ad01f7b10ff - sonar_mvn_goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.8.0.2131:sonar" + sonar_mvn_goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184:sonar" # Nexus3 docker registries container-public-registry: nexus3.onap.org:10001 diff --git a/jjb/modeling/modeling-etsicatalog.yaml b/jjb/modeling/modeling-etsicatalog.yaml index a2fc45105..5bea13db6 100644 --- a/jjb/modeling/modeling-etsicatalog.yaml +++ b/jjb/modeling/modeling-etsicatalog.yaml @@ -30,7 +30,7 @@ build-node: centos7-docker-8c-8g files: '**' archive-artifacts: '' - build-node: centos7-redis-4c-4g + build-node: ubuntu1804-builder-4c-4g - project: name: modeling-etsicatalog-sonar @@ -42,7 +42,7 @@ sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' - build-node: centos7-redis-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'modeling/etsicatalog' project-name: 'modeling-etsicatalog' branch: 'master' diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml index 24c399c3e..196a53e44 100644 --- a/jjb/oom/offline-installer.yaml +++ b/jjb/oom/offline-installer.yaml @@ -41,3 +41,22 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + +- project: + name: offline-installer-pytest + project: oom/offline-installer + project-name: offline-installer + build-node: ubuntu1804-docker-8c-8g + python-version: python3 + jobs: + - integration-tox-verify + subproject: + - 'docker-downloader': + tox-dir: 'build/download' + tox-envs: 'pytest' + pattern: 'build/download/**' + stream: + - 'master': + branch: 'master' + - 'istanbul': + branch: 'istanbul' diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 83366956c..0df072c7f 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -23,14 +23,15 @@ stream: - "master": branch: "master" + - "jakarta": + branch: "jakarta" - "istanbul": branch: "istanbul" - - "honolulu": - branch: "honolulu" + helm_bin: - helm3.5 - - helm3.3 + - helm3.6 exclude: [] subproject: [] @@ -41,17 +42,17 @@ - "{project-name}-{stream}-verify-{helm_bin}": build_script: "{oom_build_script}" files: "**" - build-timeout: 600 + build-timeout: 900 - "{project-name}-{stream}-merge-helm": build_script: "{oom_build_script}" post_build_script: !include-raw-escape: shell/publish_helm_charts.sh files: "**" - build-timeout: 600 + build-timeout: 900 - "{project-name}-{stream}-release-helm": build_script: "{oom_build_script}" post_build_script: !include-raw-escape: shell/publish_helm_charts.sh files: "**" - build-timeout: 600 + build-timeout: 900 # Below jobs disabled until future need. - "{project-name}-{subproject}-{stream}-verify-helm2": diff --git a/jjb/policy/policy-csit.yaml b/jjb/policy/policy-csit.yaml index 56d1660d3..f423d0041 100644 --- a/jjb/policy/policy-csit.yaml +++ b/jjb/policy/policy-csit.yaml @@ -132,3 +132,22 @@ trigger_jobs: - 'policy-api-{stream}-merge-java' - 'policy-docker-{stream}-merge-java' + +- project: + name: policy-clamp-project-csit + jobs: + - '{project-name}-{stream}-project-csit-verify-{functionality}' + - '{project-name}-{stream}-project-csit-{functionality}' + project-name: 'policy-clamp' + recipients: 'jrh3@att.com ram_krishna.verma@bell.ca liam.fallon@est.tech ajith.sreekumar@est.tech pd1248@att.com' + project: 'policy/docker' + stream: + - 'master': + branch: 'master' + - 'honolulu': + branch: 'honolulu' + functionality: + - 'clamp' + trigger_jobs: + - 'policy-clamp-{stream}-merge-java' + - 'policy-docker-{stream}-merge-java' diff --git a/jjb/relman/relman.yaml b/jjb/relman/relman.yaml new file mode 100644 index 000000000..94ba547b0 --- /dev/null +++ b/jjb/relman/relman.yaml @@ -0,0 +1,14 @@ +--- +- project: + name: relman-project-view + project-name: relman + views: + - project-view + +- project: + name: relman-info + project: relman + project-name: relman + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify diff --git a/jjb/rtdv3/rtdv3.yaml b/jjb/rtdv3/rtdv3.yaml index a4cec8374..eb0d11ae8 100644 --- a/jjb/rtdv3/rtdv3.yaml +++ b/jjb/rtdv3/rtdv3.yaml @@ -17,11 +17,23 @@ tox-dir: "docs/" doc-dir: "_build/html" build-node: centos7-builder-2c-1g + # the jjb is very short and filtering docs falsy raises side effects in + # ONAP doc + gerrit_trigger_file_paths: + # override the default to allow rechecking a patchset + gerrit_verify_triggers: + - patchset-created-event: + exclude-drafts: true + exclude-trivial-rebase: false + exclude-no-code-change: false + - draft-published-event + - comment-added-contains-event: + comment-contains-value: "(recheck|reverify)" # override the default to ignore ref-updated-event (tag) gerrit_merge_triggers: - change-merged-event - comment-added-contains-event: - comment-contains-value: remerge$ + comment-contains-value: "remerge" jobs: - rtdv3-global-verify - rtdv3-global-merge: diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index 3064f2c9a..4b88c5762 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -21,8 +21,8 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' 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 dd2565201..e720f3211 100644 --- a/jjb/sdc/sdc-onap-ui-angular.yaml +++ b/jjb/sdc/sdc-onap-ui-angular.yaml @@ -24,8 +24,8 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'sdc-onap-ui-angular-settings' files: '**' archive-artifacts: '' @@ -40,7 +40,7 @@ sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1804-builder-4c-4g project: 'sdc/onap-ui-angular' diff --git a/jjb/sdc/sdc-onap-ui-common.yaml b/jjb/sdc/sdc-onap-ui-common.yaml index 6316059f1..ab23a6737 100644 --- a/jjb/sdc/sdc-onap-ui-common.yaml +++ b/jjb/sdc/sdc-onap-ui-common.yaml @@ -18,8 +18,8 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'sdc-onap-ui-common-settings' files: '**' archive-artifacts: '' @@ -34,7 +34,7 @@ sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1804-builder-4c-4g project: 'sdc/onap-ui-common' diff --git a/jjb/sdc/sdc-sdc-be-common.yaml b/jjb/sdc/sdc-sdc-be-common.yaml index 5d204dd81..d365db5a5 100644 --- a/jjb/sdc/sdc-sdc-be-common.yaml +++ b/jjb/sdc/sdc-sdc-be-common.yaml @@ -21,8 +21,8 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'sdc-sdc-be-common-settings' files: '**' archive-artifacts: '' @@ -37,7 +37,7 @@ sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1804-builder-4c-4g project: 'sdc/sdc-be-common' @@ -58,8 +58,8 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'sdc-sdc-be-common-settings' - project: diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml index 9e7a5e109..32d9507fb 100644 --- a/jjb/sdc/sdc-sdc-distribution-client.yaml +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -23,8 +23,8 @@ - 'master': branch: 'master' java-version: openjdk11 - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-settings: 'sdc-sdc-distribution-client-settings' files: '**' @@ -59,7 +59,7 @@ sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1804-builder-4c-4g project: 'sdc/sdc-distribution-client' @@ -81,8 +81,8 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'sdc-sdc-distribution-client-settings' java-version: openjdk11 diff --git a/jjb/sdc/sdc-sdc-docker-base.yaml b/jjb/sdc/sdc-sdc-docker-base.yaml index 45372c3ea..5857c1c84 100644 --- a/jjb/sdc/sdc-sdc-docker-base.yaml +++ b/jjb/sdc/sdc-sdc-docker-base.yaml @@ -23,8 +23,8 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'sdc-sdc-docker-base-settings' files: '**' archive-artifacts: '' diff --git a/jjb/sdc/sdc-sdc-helm-validator.yaml b/jjb/sdc/sdc-sdc-helm-validator.yaml index 247748881..39010d320 100644 --- a/jjb/sdc/sdc-sdc-helm-validator.yaml +++ b/jjb/sdc/sdc-sdc-helm-validator.yaml @@ -74,6 +74,6 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'sdc-sdc-helm-validator-settings' diff --git a/jjb/sdc/sdc-sdc-pubsub.yaml b/jjb/sdc/sdc-sdc-pubsub.yaml index 46a68cf34..1cf4aad13 100644 --- a/jjb/sdc/sdc-sdc-pubsub.yaml +++ b/jjb/sdc/sdc-sdc-pubsub.yaml @@ -18,8 +18,8 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'sdc-sdc-pubsub-settings' files: '**' archive-artifacts: '' @@ -34,7 +34,7 @@ sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1804-builder-4c-4g project: 'sdc/sdc-pubsub' diff --git a/jjb/sdc/sdc-sdc-tosca.yaml b/jjb/sdc/sdc-sdc-tosca.yaml index c8aa37de2..9b0c252b7 100644 --- a/jjb/sdc/sdc-sdc-tosca.yaml +++ b/jjb/sdc/sdc-sdc-tosca.yaml @@ -4,6 +4,7 @@ project-name: sdc-sdc-tosca views: - project-view + java-version: openjdk11 - project: name: sdc-sdc-tosca @@ -22,13 +23,14 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'sdc-sdc-tosca-settings' files: '**' archive-artifacts: '' build-timeout: 60 maven-version: 'mvn36' + java-version: openjdk11 - project: name: sdc-sdc-tosca-sonar @@ -38,7 +40,7 @@ sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1804-builder-4c-4g project: 'sdc/sdc-tosca' @@ -48,6 +50,7 @@ mvn-params: '-Dsonar.branch={branch}' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m' + java-version: openjdk11 - project: name: sdc-sdc-tosca-clm @@ -59,9 +62,10 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'sdc-sdc-tosca-settings' + java-version: openjdk11 - project: name: sdc-sdc-tosca-info @@ -71,3 +75,4 @@ build-node: centos7-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 41a1bb06f..43f0db8ed 100644 --- a/jjb/sdc/sdc-sdc-workflow-designer.yaml +++ b/jjb/sdc/sdc-sdc-workflow-designer.yaml @@ -28,8 +28,8 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'sdc-sdc-workflow-designer-settings' files: '**' archive-artifacts: '' @@ -46,7 +46,7 @@ sonarcloud-project-organization: '{sonarcloud_project_organization}' sonarcloud-api-token: '{sonarcloud_api_token}' sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' - sonar-mvn-goal: "org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar" + sonar-mvn-goal: '{sonar_mvn_goal}' cron: '@daily' build-node: ubuntu1804-builder-4c-4g project: 'sdc/sdc-workflow-designer' @@ -68,8 +68,8 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'sdc-sdc-workflow-designer-settings' - project: diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 184f6f063..46b4b79ea 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -67,8 +67,8 @@ - 'master': branch: 'master' java-version: openjdk11 - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-settings: 'sdc-settings' files: '**' @@ -112,8 +112,8 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-version: 'mvn36' mvn-settings: 'sdc-settings' java-version: openjdk11 diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index f7c7d690b..efa64ec0f 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -38,6 +38,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-version : "mvn36" mvn-settings: 'sdnc-apps-settings' @@ -106,6 +108,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-version : "mvn36" mvn-settings: 'sdnc-apps-settings' diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml index 4c168822c..989853f7b 100644 --- a/jjb/sdnc/sdnc-csit.yaml +++ b/jjb/sdnc/sdnc-csit.yaml @@ -17,6 +17,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'sdnc-oam-settings' robot-options: '' branch: 'master' diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 9447158e1..0da9c8ccb 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -19,6 +19,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-version: "mvn36" mvn-settings: 'sdnc-northbound-settings' @@ -68,6 +70,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'sdnc-northbound-settings' java-version: openjdk11 mvn-version: 'mvn36' diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 4775d7d63..f38b1de4c 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -28,6 +28,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-version: "mvn36" mvn-settings: 'sdnc-oam-settings' @@ -69,6 +71,8 @@ branch: 'master' - 'istanbul': branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'sdnc-oam-settings' java-version: openjdk11 mvn-version: 'mvn36' diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml index 366847912..d230d005e 100644 --- a/jjb/so/so-adapters-so-nssmf-adapter.yaml +++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml @@ -39,8 +39,8 @@ - 'honolulu': branch: 'honolulu' java-version: openjdk11 - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 mvn-settings: 'so-adapters-so-nssmf-adapter-settings' files: '**' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 7f71b5035..510e10879 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -29,8 +29,8 @@ - 'master': branch: 'master' java-version: openjdk11 - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 - 'recursive-orch': branch: 'recursive-orch' @@ -101,8 +101,8 @@ stream: - 'master': branch: 'master' - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'so-settings' - project: @@ -117,6 +117,6 @@ - 'master': branch: 'master' java-version: openjdk11 - - 'istanbul': - branch: 'istanbul' + - 'jakarta': + branch: 'jakarta' java-version: openjdk11 diff --git a/jjb/usecases/usecases-csit.yaml b/jjb/usecases/usecases-csit.yaml index c9e70d8b7..0befe7ba3 100644 --- a/jjb/usecases/usecases-csit.yaml +++ b/jjb/usecases/usecases-csit.yaml @@ -13,6 +13,7 @@ - 'pnf-sw-upgrade': trigger_jobs: robot-options: '' + cron: '' - project: name: usecases-config-over-netconf diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml index 08ec49b6c..674e71a89 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-csit.yaml @@ -5,7 +5,7 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'vfc-gvnfm-vnflcm' - recipients: 'yangyanyj@chinamobile.com' + recipients: 'dengyuanhong@chinamobile.com' stream: 'master' functionality: - 'sanity-check': diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml index e05273b37..13c095550 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-java.yaml @@ -47,7 +47,7 @@ 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: centos7-redis-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'vfc/gvnfm/vnflcm' project-name: 'vfc-gvnfm-vnflcm-lcm' branch: 'master' diff --git a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml index 991848acb..797e0a0d6 100644 --- a/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml +++ b/jjb/vfc/vfc-gvnfm-vnflcm-python.yaml @@ -8,7 +8,7 @@ - 'master': branch: 'master' mvn-settings: 'vfc-gvnfm-vnflcm-settings' - build-node: centos7-redis-4c-4g + build-node: ubuntu1804-builder-4c-4g subproject: - 'lcm': path: 'lcm' diff --git a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml index e4a0d8fa5..cd4b848ac 100644 --- a/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml +++ b/jjb/vfc/vfc-gvnfm-vnfres-csit.yaml @@ -5,7 +5,7 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'vfc-gvnfm-vnfres' - recipients: 'yangyanyj@chinamobile.com' + recipients: 'dengyuanhong@chinamobile.com' stream: 'master' functionality: - 'sanity-check': diff --git a/jjb/vfc/vfc-nfvo-lcm-csit.yaml b/jjb/vfc/vfc-nfvo-lcm-csit.yaml index c68733073..1a03d5d88 100644 --- a/jjb/vfc/vfc-nfvo-lcm-csit.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-csit.yaml @@ -5,7 +5,7 @@ - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'vfc-nfvo-lcm' - recipients: 'yangyanyj@chinamobile.com' + recipients: 'dengyuanhong@chinamobile.com' stream: 'master' functionality: - 'sanity-check': diff --git a/jjb/vfc/vfc-nfvo-lcm-java.yaml b/jjb/vfc/vfc-nfvo-lcm-java.yaml index fd848c53c..4fe8a6d4a 100644 --- a/jjb/vfc/vfc-nfvo-lcm-java.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-java.yaml @@ -36,7 +36,7 @@ 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: centos7-redis-4c-4g + build-node: ubuntu1804-builder-4c-4g project: 'vfc/nfvo/lcm' project-name: 'vfc-nfvo-lcm' branch: 'master' diff --git a/jjb/vfc/vfc-nfvo-lcm-python.yaml b/jjb/vfc/vfc-nfvo-lcm-python.yaml index 6fa0d24ce..19791ef28 100644 --- a/jjb/vfc/vfc-nfvo-lcm-python.yaml +++ b/jjb/vfc/vfc-nfvo-lcm-python.yaml @@ -7,7 +7,7 @@ - 'master': branch: 'master' mvn-settings: 'vfc-nfvo-lcm-settings' - build-node: centos7-redis-4c-4g + build-node: ubuntu1804-builder-4c-4g subproject: - 'lcm': path: '.' diff --git a/jjb/vnfsdk/vnfsdk-refrepo.yaml b/jjb/vnfsdk/vnfsdk-refrepo.yaml index 9702e88ad..519c4471f 100644 --- a/jjb/vnfsdk/vnfsdk-refrepo.yaml +++ b/jjb/vnfsdk/vnfsdk-refrepo.yaml @@ -73,3 +73,23 @@ - 'istanbul': branch: 'istanbul' mvn-settings: 'vnfsdk-refrepo-settings' + +- project: + name: vnfsdk-refrepo-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-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: '{sonar_mvn_goal}' + build-node: centos7-docker-8c-8g + project: 'vnfsdk/refrepo' + project-name: 'vnfsdk-refrepo' + branch: 'master' + mvn-settings: 'vnfsdk-refrepo-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/vnfsdk/vnfsdk-validation.yaml b/jjb/vnfsdk/vnfsdk-validation.yaml index 1d6940621..4364220f5 100644 --- a/jjb/vnfsdk/vnfsdk-validation.yaml +++ b/jjb/vnfsdk/vnfsdk-validation.yaml @@ -82,3 +82,23 @@ pre_script: !include-raw-escape: ./generate-dosc.sh project_id: org.onap.vnfsdk.validation post_script: !include-raw-escape: ./upload-artifact.sh + +- project: + name: vnfsdk-validation-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-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: '{sonar_mvn_goal}' + build-node: centos7-docker-8c-8g + project: 'vnfsdk/validation' + project-name: 'vnfsdk-validation' + branch: 'master' + mvn-settings: 'vnfsdk-validation-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml index 479be5396..1c7867196 100644 --- a/packer/provision/helm.yaml +++ b/packer/provision/helm.yaml @@ -6,10 +6,9 @@ become_method: sudo vars: - kubectl_version: 1.15.11 - helm_version: 2.16.6 - helm3_3_version: 3.3.4 - helm3_5_version: 3.5.1 + kubectl_version: 1.19.11 + helm3_6_version: 3.6.3 + helm3_5_version: 3.5.2 chartmuseum_version: 0.12.0 tasks: @@ -20,55 +19,37 @@ mode: 0775 become: yes - - name: 'Install Helm {{helm_version}}' + - name: 'Install Helm 3.6 {{helm3_6_version}}' block: - - name: 'Fetch tar.gz for {{helm_version}}' - get_url: - url: "http://storage.googleapis.com/kubernetes-helm/helm-v{{helm_version}}-linux-amd64.tar.gz" - dest: "/tmp/helm-v{{helm_version}}-linux-amd64.tar.gz" - - name: 'Unarchive {{helm_version}}' - unarchive: - src: "/tmp/helm-v{{helm_version}}-linux-amd64.tar.gz" - dest: /tmp - remote_src: true - become: yes - - name: 'Move {{helm_version}} bin to /usr/local/bin and set as executable' - command: 'mv /tmp/linux-amd64/helm /usr/local/bin/helm' - become: yes - - name: 'Check Helm {{helm_version}}' - command: 'which helm' - - - name: 'Install Helm 3.3 {{helm3_3_version}}' - block: - - name: 'Create directory /tmp/helm3_3' + - name: 'Create directory /tmp/helm3_6' file: - path: /tmp/helm3_3 + path: /tmp/helm3_6 state: directory - - name: 'Fetch tar.gz for Helm 3.3' + - name: 'Fetch tar.gz for Helm 3.6' get_url: - url: "https://get.helm.sh/helm-v{{helm3_3_version}}-linux-amd64.tar.gz" - dest: /tmp/helm3_3 - - name: 'Unarchive Helm 3.3' + url: "https://get.helm.sh/helm-v{{helm3_6_version}}-linux-amd64.tar.gz" + dest: /tmp/helm3_6 + - name: 'Unarchive Helm 3.6' unarchive: - src: "/tmp/helm3_3/helm-v{{helm3_3_version}}-linux-amd64.tar.gz" - dest: /tmp/helm3_3 + src: "/tmp/helm3_6/helm-v{{helm3_6_version}}-linux-amd64.tar.gz" + dest: /tmp/helm3_6 remote_src: true become: yes - - name: 'Move Helm 3.3 bin to /usr/local/bin and set as executable' - command: 'mv /tmp/helm3_3/linux-amd64/helm /usr/local/bin/helm3.3' + - name: 'Move Helm 3.6 bin to /usr/local/bin and set as executable' + command: 'mv /tmp/helm3_6/linux-amd64/helm /usr/local/bin/helm3.6' become: yes - - name: 'Check Helm 3.3' - command: 'which helm3.3' + - name: 'Check Helm 3.6' + command: 'which helm3.6' - name: 'Check kubectl {{kubectl_version}}' command: 'which kubectl' - - name: 'Install Helm 3.3' + - name: 'Install Helm 3.6' shell: | - echo "----> Installing helm 3.3" - wget 'https://get.helm.sh/helm-v{{helm3_3_version}}-linux-amd64.tar.gz' - tar -xvf 'https://get.helm.sh/helm-v{{helm3_3_version}}-linux-amd64.tar.gz' - mv linux-amd64/helm /usr/local/bin/helm3.3 - which helm3.3 + echo "----> Installing helm 3.6" + wget 'https://get.helm.sh/helm-v{{helm3_6_version}}-linux-amd64.tar.gz' + tar -xvf 'https://get.helm.sh/helm-v{{helm3_6_version}}-linux-amd64.tar.gz' + mv linux-amd64/helm /usr/local/bin/helm3.6 + which helm3.6 become: true - name: 'Install Helm3.5 {{helm3_5_version}}' diff --git a/shell/onap-gerrit-review-wrapper.sh b/shell/onap-gerrit-review-wrapper.sh new file mode 100755 index 000000000..ba07fe724 --- /dev/null +++ b/shell/onap-gerrit-review-wrapper.sh @@ -0,0 +1,36 @@ +#!/bin/sh + +# ================================================================================ +# Copyright (c) 2022 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= + +set -eu +echo "--> onap-gerrit-review-wrapper.sh" + +# Cleanup temporary directory if exist +rm -Rf /tmp/ogr + +# Create temporary directory to clone OGR repository +( + mkdir /tmp/ogr + cd /tmp/ogr + git clone https://github.com/TonyLHansen/onap-gerrit-review.git +) +# Add OGR/bin to PATH +export PATH=$PATH:/tmp/ogr/onap-gerrit-review/bin + +# Execute OGR +onap-gerrit-review -E git pull "https://gerrit.onap.org/r/$GERRIT_PROJECT" "$GERRIT_REFSPEC" +