diff options
| -rw-r--r-- | jjb/cps/cps-ncmp-dmi-plugin.yaml | 97 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml | 41 | ||||
| -rw-r--r-- | jjb/dcaegen2/dcaegen2-services-pm-mapper-csit.yaml (renamed from jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml) | 6 | ||||
| -rw-r--r-- | jjb/policy/policy-csit-jobs.yaml | 6 | ||||
| -rw-r--r-- | jjb/sdc/sdc-csit.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdc/sdc.yaml | 2 | ||||
| -rw-r--r-- | jjb/vnfsdk/vnfsdk-ves-agent.yaml | 30 | ||||
| m--------- | packer/common-packer | 0 | ||||
| -rwxr-xr-x | shell/helm-repo-init.sh | 1 | ||||
| -rwxr-xr-x | shell/publish_helm_charts.sh | 9 |
10 files changed, 130 insertions, 64 deletions
diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml new file mode 100644 index 000000000..780c7c168 --- /dev/null +++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml @@ -0,0 +1,97 @@ +--- +- project: + name: cps-ncmp-dmi-plugin-project-view + project-name: cps-ncmp-dmi-plugin + views: + - project-view + +- project: + name: cps-ncmp-dmi-plugin-info + project: cps/ncmp-dmi-plugin + project-name: cps-ncmp-dmi-plugin + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: cps-ncmp-dmi-plugin + java-version: openjdk11 + mvn-version: mvn36 + maven-version: mvn36 + project-name: cps-ncmp-dmi-plugin + project: cps/ncmp-dmi-plugin + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' + jobs: + - gerrit-maven-docker-verify: + container-public-registry: nexus3.onap.org:10001 + - gerrit-maven-merge + - gerrit-maven-stage: + sign-artifacts: true + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + - gerrit-maven-docker-stage: + build-node: centos7-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-8c-8g + stream: + - 'master': + branch: master + mvn-settings: cps-ncmp-dmi-plugin-settings + files: '**' + archive-artifacts: '' + build-node: centos7-docker-8c-8g + +- project: + name: cps-ncmp-dmi-plugin-clm + java-version: openjdk11 + mvn-version: mvn36 + maven-version: mvn36 + jobs: + - gerrit-maven-clm + nexus-iq-namespace: onap- + project: cps/ncmp-dmi-plugin + project-name: cps-ncmp-dmi-plugin + branch: master + mvn-settings: cps-ncmp-dmi-plugin-settings + build-node: centos7-docker-8c-8g + +- project: + name: cps-ncmp-dmi-plugin-sonar + java-version: openjdk11 + mvn-version: mvn36 + maven-version: mvn36 + jobs: + - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: '{sonar_mvn_goal}' + cron: '@daily' + build-node: 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' + +- project: + name: cps-ncmp-dmi-plugin-whitesource + project-name: cps-ncmp-dmi-plugin + jobs: + - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: mvn36 + mvn-settings: cps-ncmp-dmi-plugin-settings + wss-product-name: cps-ncmp-dmi-plugin + mvn-clean-install: true + project: cps/ncmp-dmi-plugin + branch: master + build-node: centos7-docker-8c-8g + diff --git a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml index f82be7b17..4fbd716e8 100644 --- a/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml +++ b/jjb/dcaegen2/dcaegen2-analytics-tca-gen2.yaml @@ -1,24 +1,7 @@ --- - project: name: dcaegen2-analytics-tca-gen2 - # job template iterators - project-name: 'dcaegen2-analytics-tca-gen2' - stream: - - 'master': - branch: 'master' - - 'guilin': - branch: 'guilin' - - 'honolulu': - branch: 'honolulu' - java-version: openjdk11 # apply to all jobs - project: 'dcaegen2/analytics/tca-gen2' - mvn-settings: 'dcaegen2-analytics-tca-gen2-settings' - files: '**' - maven-deploy-properties: | - deployAtEnd=true - archive-artifacts: '' - build-node: ubuntu1804-docker-8c-8g jobs: - '{project-name}-{stream}-verify-java': - '{project-name}-{stream}-merge-java': @@ -34,6 +17,26 @@ sign-artifacts: true build-node: centos7-docker-8c-8g maven-versions-plugin: true + project: 'dcaegen2/analytics/tca-gen2' + # job template iterators + project-name: 'dcaegen2-analytics-tca-gen2' + stream: + - 'master': + branch: 'master' + - 'guilin': + branch: 'guilin' + - 'honolulu': + branch: 'honolulu' + java-version: openjdk11 + mvn-settings: 'dcaegen2-analytics-tca-gen2-settings' + mvn-version: 'mvn35' + maven-version: 'mvn35' + files: '**' + maven-deploy-properties: | + deployAtEnd=true + archive-artifacts: '' + build-node: ubuntu1804-docker-8c-8g + - project: name: dcaegen2-analytics-tca-gen2-sonar java-version: openjdk11 @@ -52,6 +55,8 @@ mvn-settings: 'dcaegen2-analytics-tca-gen2-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + mvn-version: 'mvn35' + maven-version: 'mvn35' - project: name: dcaegen2-analytics-tca-gen2-clm @@ -64,6 +69,8 @@ project-name: 'dcaegen2-analytics-tca-gen2' branch: 'master' mvn-settings: 'dcaegen2-analytics-tca-gen2-settings' + mvn-version: 'mvn35' + maven-version: 'mvn35' - project: name: dcaegen2-analytics-tca-gen2-info diff --git a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml b/jjb/dcaegen2/dcaegen2-services-pm-mapper-csit.yaml index d260fe8ec..f7bbf5a49 100644 --- a/jjb/dcaegen2/dcaegen2-services-pmmapper-csit.yaml +++ b/jjb/dcaegen2/dcaegen2-services-pm-mapper-csit.yaml @@ -1,18 +1,18 @@ --- - project: - name: dcaegen2-services-pmmapper-csit + name: dcaegen2-services-pm-mapper-csit jobs: - '{project-name}-review-verification-maven-{stream}': mvn-goals: clean install docker:build - '{project-name}-merge-verification-maven-{stream}': mvn-goals: clean install docker:build - project-name: 'dcaegen2-services-pmmapper' + project-name: 'dcaegen2-services-pm-mapper' recipients: 'vv770d@att.com lego@est.tech rajendra.jaiswal@ericsson.com' # project name in gerrit project: 'dcaegen2/services/pm-mapper' stream: - 'master': branch: 'master' - mvn-settings: 'dcaegen2-services-pmmapper-settings' + mvn-settings: 'dcaegen2-services-pm-mapper-settings' robot-options: '' branch: 'master' diff --git a/jjb/policy/policy-csit-jobs.yaml b/jjb/policy/policy-csit-jobs.yaml index d18891549..a7ae387b1 100644 --- a/jjb/policy/policy-csit-jobs.yaml +++ b/jjb/policy/policy-csit-jobs.yaml @@ -42,9 +42,6 @@ - lf-infra-pre-build - lf-update-java-alternatives: java-version: '{java-version}' - - integration-install-robotframework - - inject: - properties-file: 'env.properties' - integration-run-project-test publishers: @@ -104,9 +101,6 @@ - lf-infra-pre-build - lf-update-java-alternatives: java-version: '{java-version}' - - integration-install-robotframework - - inject: - properties-file: 'env.properties' - integration-run-project-test publishers: diff --git a/jjb/sdc/sdc-csit.yaml b/jjb/sdc/sdc-csit.yaml index c4fcc36a3..714aa7712 100644 --- a/jjb/sdc/sdc-csit.yaml +++ b/jjb/sdc/sdc-csit.yaml @@ -5,7 +5,7 @@ - '{project-name}-{stream}-verify-java': # this build is integration test only - CSIT (Verify 2/2) mvn-goals: clean install - mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -Ddocker.skip.push=true -P docker,all-for-integration-tests-only' + mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -Ddocker.skip.push=true -P docker,all-for-integration-tests-only,integration-tests-with-helm-validator' build-node: 'ubuntu1804-docker-8c-16g' archive-artifacts: > **/*.log diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index 0fa71bef1..a40e24019 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -35,7 +35,7 @@ build-node: 'ubuntu1804-docker-8c-16g' docker-pom: 'pom.xml' mvn-profile: 'docker' - mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' + mvn-params: '-Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/ -P integration-tests-with-helm-validator' # running everything (unit tests and integration tests in a single job for merge, as we don't need // run # for merge, but still saving integration tests results and report. archive-artifacts: > diff --git a/jjb/vnfsdk/vnfsdk-ves-agent.yaml b/jjb/vnfsdk/vnfsdk-ves-agent.yaml index 7d4191456..15795df19 100644 --- a/jjb/vnfsdk/vnfsdk-ves-agent.yaml +++ b/jjb/vnfsdk/vnfsdk-ves-agent.yaml @@ -34,36 +34,6 @@ build-node: ubuntu1804-builder-4c-4g - project: - name: vnfsdk-ves-agent-sonar - jobs: - - gerrit-maven-sonar - - gerrit-cmake-sonar: - build-timeout: 60 - pre-build: !include-raw-escape: ./vnfsdk-ves-agent-cpp.sh - build-dir: $WORKSPACE/veslibrary/ves_cpplibrary/src/build - cmake-opts: '-DENABLE_COVERAGE=on -DCOVERAGE_DIR=coverage' - sonarcloud-api-token: '{sonarcloud_api_token}' - sonarcloud-organization: '{sonarcloud_project_organization}' - sonarcloud-project-key: '{sonarcloud_project_organization}_vnfsdk-ves-agent' - make-opts: -j6 - stream: master - build-node: centos7-builder-4c-4g - 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: 'vnfsdk/ves-agent' - project-name: 'vnfsdk-ves-agent' - branch: 'master' - mvn-params: '-f veslibrary/ves_javalibrary/evel_javalib2/pom.xml' - mvn-settings: 'vnfsdk-ves-agent-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: name: vnfsdk-ves-agent-info jobs: - gerrit-info-yaml-verify diff --git a/packer/common-packer b/packer/common-packer -Subproject 74b6be7301b5c407d1ccf4cf6093b3b8cd308ad +Subproject 3494343faf0fc4221bfdb6cefc8bc0af0452f98 diff --git a/shell/helm-repo-init.sh b/shell/helm-repo-init.sh index d8990434a..937f0e7d0 100755 --- a/shell/helm-repo-init.sh +++ b/shell/helm-repo-init.sh @@ -8,3 +8,4 @@ chartmuseum --port=6464 --storage="local" --storage-local-rootdir=".chartstorage source helm.prop $HELM_BIN plugin install https://github.com/chartmuseum/helm-push.git $HELM_BIN repo add local http://localhost:6464 +$HELM_BIN repo add onap http://localhost:6464 diff --git a/shell/publish_helm_charts.sh b/shell/publish_helm_charts.sh index 9c511c5b6..a6a09ebf1 100755 --- a/shell/publish_helm_charts.sh +++ b/shell/publish_helm_charts.sh @@ -11,16 +11,13 @@ for chart in "${helm_charts[@]}"; do chart=$(echo "$chart" | xargs) case "$BUILD_TYPE" in 'snapshot') - echo "-n --upload-file $chart https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$GERRIT_BRANCH/$chart" - curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$GERRIT_BRANCH/$chart" - curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE//$GERRIT_BRANCH/$GIT_COMMIT/$chart" + curl -n --upload-file "$chart" "https://nexus3.onap.org/repository/onap-helm-testing/" ;; 'staging') - curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$GERRIT_BRANCH/$chart" - curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$GERRIT_BRANCH/$GIT_COMMIT/$chart" + curl -n --upload-file "$chart" "https://nexus3.onap.org/repository/onap-helm-testing/" ;; 'release') - curl -n --upload-file "$chart" "https://nexus.onap.org/content/sites/oom-helm-$BUILD_TYPE/$chart" + curl -n --upload-file "$chart" "https://nexus3.onap.org/repository/onap-helm-release/" ;; *) echo "You must set BUILD_TYPE to one of (snapshot, staging, release)." |