diff options
20 files changed, 160 insertions, 90 deletions
diff --git a/jjb/ccsdk/sli.yaml b/jjb/ccsdk/sli.yaml new file mode 100644 index 000000000..5111d8182 --- /dev/null +++ b/jjb/ccsdk/sli.yaml @@ -0,0 +1,89 @@ +--- +- project: + name: ccsdk-sli + project-name: 'ccsdk-sli' + jobs: + - gerrit-maven-verify + - gerrit-maven-merge: + cron: '@daily' + - gerrit-maven-stage: + build-node: centos7-builder-4c-4g + sign-artifacts: true + cron: '' + - '{project-name}-gerrit-release-jobs': + build-node: centos7-docker-8c-8g + + project: 'ccsdk/sli' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' + 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: ubuntu1804-builder-4c-4g + mvn-snapshot-id: 'ecomp-snapshots' + nexus-snapshot-repo: 'snapshots' + +- project: + name: ccsdk-sli-sonar + jobs: + - gerrit-maven-sonar + sonarcloud: true + sonarcloud-project-organization: '{sonarcloud_project_organization}' + sonarcloud-api-token: '{sonarcloud_api_token}' + sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}' + sonar-mvn-goal: '{sonar_mvn_goal}' + cron: '@daily' + build-node: ubuntu1804-builder-4c-4g + project: 'ccsdk/sli' + project-name: 'ccsdk-sli' + branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' + mvn-settings: 'ccsdk-sli-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + +- project: + name: ccsdk-sli-clm + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'ccsdk/sli' + project-name: 'ccsdk-sli' + stream: + - 'master': + branch: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' + mvn-settings: 'ccsdk-sli-settings' + build-node: ubuntu1804-builder-4c-4g + +- project: + name: ccsdk-sli-info + project-name: ccsdk-sli + jobs: + - gerrit-info-yaml-verify + build-node: centos7-builder-2c-1g + project: ccsdk/sli + branch: master + +- project: + name: ccsdk-sli-whitesource + project-name: ccsdk-sli + jobs: + - gerrit-whitesource-scan + java-version: openjdk11 + mvn-version: 'mvn36' + mvn-settings: 'ccsdk-sli-settings' + wss-product-name: ccsdk + mvn-clean-install: true + project: ccsdk/sli + branch: master diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml index 39a6a379c..1a291462f 100644 --- a/jjb/dmaap/dmaap-buscontroller.yaml +++ b/jjb/dmaap/dmaap-buscontroller.yaml @@ -22,33 +22,13 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'dmaap-buscontroller-settings' files: '**' archive-artifacts: '' java-version: openjdk11 -- project: - name: dmaap-buscontroller-java8 - 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' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - project: 'dmaap/buscontroller' - stream: - - 'elalto': - branch: 'elalto' - mvn-settings: 'dmaap-buscontroller-settings' - files: '**' - archive-artifacts: '' - java-version: openjdk8 - # removed sonar job from this template because this repo only builds a docker container # and the 0% coverage report from Sonar was causing repeated escalations. diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index ffd5a2d8e..3e3676bc0 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -15,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'guilin': + branch: 'guilin' mvn-settings: 'dmaap-datarouter-settings' files: '**' archive-artifacts: '' @@ -22,28 +24,6 @@ - project: - name: dmaap-datarouter-java8 - project-name: 'dmaap-datarouter' - 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' - container-public-registry: 'nexus3.onap.org:10001' - container-staging-registry: 'nexus3.onap.org:10003' - project: 'dmaap/datarouter' - stream: - - 'frankfurt': - branch: 'frankfurt' - - 'elalto': - branch: 'elalto' - mvn-settings: 'dmaap-datarouter-settings' - files: '**' - archive-artifacts: '' - java-version: openjdk8 - -- project: name: dmaap-datarouter-sonar jobs: - gerrit-maven-sonar diff --git a/jjb/dmaap/dmaap-dbcapi.yaml b/jjb/dmaap/dmaap-dbcapi.yaml index 4eeafa958..cfe816d8c 100644 --- a/jjb/dmaap/dmaap-dbcapi.yaml +++ b/jjb/dmaap/dmaap-dbcapi.yaml @@ -17,32 +17,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' - # 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: dmaap-dbcapi-java8 - project-name: 'dmaap-dbcapi' - jobs: - - '{project-name}-{stream}-verify-java' - - '{project-name}-{stream}-merge-java' - - gerrit-maven-stage: - sign-artifacts: true - build-node: centos7-builder-4c-4g - maven-versions-plugin: true - project: 'dmaap/dbcapi' - mvn-settings: 'dmaap-dbcapi-settings' - java-version: openjdk8 - stream: - - 'elalto': - branch: 'elalto' + - 'guilin': + branch: 'guilin' # 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 diff --git a/jjb/dmaap/dmaap-kafka.yaml b/jjb/dmaap/dmaap-kafka.yaml index 350eb0308..65d7dbcf4 100644 --- a/jjb/dmaap/dmaap-kafka.yaml +++ b/jjb/dmaap/dmaap-kafka.yaml @@ -9,6 +9,8 @@ stream: - 'master': branch: 'master' + - 'guilin': + branch: 'guilin' mvn-settings: 'dmaap-kafka11aaf-settings' - project: diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml index 6549204a2..f84117476 100644 --- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml +++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml @@ -15,6 +15,8 @@ stream: - 'master': branch: 'master' + - 'guilin': + branch: 'guilin' mvn-settings: 'dmaap-messagerouter-dmaapclient-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml index 3c0df034a..5f3858bc0 100644 --- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml +++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml @@ -14,6 +14,8 @@ stream: - 'master': branch: 'master' + - 'guilin': + branch: 'guilin' mvn-settings: 'dmaap-messagerouter-messageservice-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml index 331176ad3..a90b327ed 100644 --- a/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml +++ b/jjb/dmaap/dmaap-messagerouter-mirroragent.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'guilin': + branch: 'guilin' mvn-settings: 'dmaap-messagerouter-mirroragent-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml index 2d872f748..7e2271638 100644 --- a/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml +++ b/jjb/dmaap/dmaap-messagerouter-msgrtr.yaml @@ -16,6 +16,8 @@ stream: - 'master': branch: 'master' + - 'guilin': + branch: 'guilin' mvn-settings: 'dmaap-messagerouter-msgrtr-settings' files: '**' archive-artifacts: '' diff --git a/jjb/dmaap/dmaap-zookeeper.yaml b/jjb/dmaap/dmaap-zookeeper.yaml index 4a0b523bd..5854bcca5 100644 --- a/jjb/dmaap/dmaap-zookeeper.yaml +++ b/jjb/dmaap/dmaap-zookeeper.yaml @@ -9,6 +9,8 @@ stream: - 'master': branch: 'master' + - 'guilin': + branch: 'guilin' mvn-settings: 'dmaap-zookeeper-settings' - project: name: dmaap-zookeeper-docker diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml index 309a7c7b1..a1a051fbb 100644 --- a/jjb/global-templates-docker.yaml +++ b/jjb/global-templates-docker.yaml @@ -302,14 +302,15 @@ DOCKERHUB_REGISTRY=docker.io - job-template: - # Job template PoC for tagging snapshot docker images + # Job template for tagging snapshot docker images # identified by given unique tag as STAGING + # in project-specific CSIT versioning flow # The purpose of this job template is to run: # 1. login to the docker registry # 2. run a specified shell builder for tagging # - name: '{project-name}-{stream}-docker-staging-PoC' + name: '{project-name}-{stream}-docker-staging' project-type: freestyle node: 'ubuntu1804-docker-8c-8g' disabled: '{disabled}' diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml index 0bfb0b94c..d29528a3b 100644 --- a/jjb/global-templates-golang.yaml +++ b/jjb/global-templates-golang.yaml @@ -203,8 +203,8 @@ maven-version: '{maven-version}' - job-template: - # Job template PoC for building & pushing snapshot docker images - # for CSIT verification + # Job template for building and pushing uniquely tagged + # snapshot docker images in project-specific CSIT flow # # golangver can be set to golang110 or golang111 # depending on what version is needed by the project @@ -215,7 +215,7 @@ # 2. run a specified shell builder # - name: '{project-name}-{stream}-golang-docker-snapshot-PoC' + name: '{project-name}-{stream}-golang-docker-snapshot' golangver: 'golang110' project-type: freestyle node: 'ubuntu1804-docker-8c-8g' diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml index f53804609..f07e6e453 100644 --- a/jjb/integration/integration-templates-csit.yaml +++ b/jjb/integration/integration-templates-csit.yaml @@ -130,7 +130,14 @@ send-to-individuals: true - job-template: - name: '{project-name}-{stream}-project-csit-PoC' + # Job template for project-specific CSIT jobs + # + # The purpose of this job template is to execute + # project-specific CSIT test cases for docker image versions + # identified by unique docker tag input parameter + # + + name: '{project-name}-{stream}-project-csit' disabled: '{disabled}' project-type: freestyle build-node: 'ubuntu1804-docker-8c-8g' @@ -186,7 +193,16 @@ send-to-individuals: true - job-template: - name: '{project-name}-unified-review-{stream}-PoC' + # Job template for review verification jobs in + # project-specific CSIT flow + # + # The purpose of this job template is to: + # 1. trigger snapshot docker build job + # 2. trigger CSIT job + # 3. give a verify vote to the triggering review + # + + name: '{project-name}-review-verification-{stream}' disabled: '{disabled}' project-type: freestyle build-node: 'ubuntu1804-docker-8c-8g' @@ -221,7 +237,7 @@ global-settings-file: "{mvn-global-settings}" settings-file: "{mvn-settings}" - trigger-builds: - - project: "{project-name}-{stream}-{artifact-type}-docker-snapshot-PoC" + - project: "{project-name}-{stream}-{artifact-type}-docker-snapshot" predefined-parameters: | UNIQUE_DOCKER_TAG=$BUILD_TAG PROJECT=$PROJECT @@ -229,7 +245,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC block: true - trigger-builds: - - project: "{project-name}-{stream}-project-csit-PoC" + - project: "{project-name}-{stream}-project-csit" predefined-parameters: | UNIQUE_DOCKER_TAG=$BUILD_TAG PROJECT=$PROJECT @@ -246,7 +262,17 @@ - lf-infra-publish - job-template: - name: '{project-name}-unified-merge-{stream}-PoC' + # Job template for merge verification jobs in + # project-specific CSIT flow + # + # The purpose of this job template is to trigger + # the following jobs in sequence: + # 1. snapshot docker build job + # 2. CSIT job + # 3. docker staging job + # + + name: '{project-name}-merge-verification-{stream}' disabled: '{disabled}' project-type: freestyle build-node: 'ubuntu1804-docker-8c-8g' @@ -281,7 +307,7 @@ global-settings-file: "{mvn-global-settings}" settings-file: "{mvn-settings}" - trigger-builds: - - project: "{project-name}-{stream}-{artifact-type}-docker-snapshot-PoC" + - project: "{project-name}-{stream}-{artifact-type}-docker-snapshot" predefined-parameters: | UNIQUE_DOCKER_TAG=$BUILD_TAG PROJECT=$PROJECT @@ -289,7 +315,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC block: true - trigger-builds: - - project: "{project-name}-{stream}-project-csit-PoC" + - project: "{project-name}-{stream}-project-csit" predefined-parameters: | UNIQUE_DOCKER_TAG=$BUILD_TAG PROJECT=$PROJECT @@ -297,7 +323,7 @@ GERRIT_REFSPEC=$GERRIT_REFSPEC block: true - trigger-builds: - - project: "{project-name}-{stream}-docker-staging-PoC" + - project: "{project-name}-{stream}-docker-staging" predefined-parameters: | UNIQUE_DOCKER_TAG=$BUILD_TAG PROJECT=$PROJECT diff --git a/jjb/integration/simulators/integration-ran-simulator.yaml b/jjb/integration/simulators/integration-ran-simulator.yaml index aea005d17..bc2b584cf 100644 --- a/jjb/integration/simulators/integration-ran-simulator.yaml +++ b/jjb/integration/simulators/integration-ran-simulator.yaml @@ -7,7 +7,6 @@ branch: 'master' project: 'integration/simulators/ran-simulator' mvn-settings: 'integration-simulators-ran-simulator-settings' - files: '**' maven-deploy-properties: | deployAtEnd=true archive-artifacts: '' @@ -15,6 +14,7 @@ jobs: - '{project-name}-{stream}-verify-java': mvn-goals: 'clean install' + pattern: 'ransim/**' - '{project-name}-{stream}-merge-java': mvn-goals: 'clean deploy' - '{project-name}-gerrit-release-jobs': diff --git a/jjb/music/music-distributed-kv-store-csit.yaml b/jjb/music/music-distributed-kv-store-csit.yaml index 52e367073..4dd27b6bc 100644 --- a/jjb/music/music-distributed-kv-store-csit.yaml +++ b/jjb/music/music-distributed-kv-store-csit.yaml @@ -2,9 +2,9 @@ - project: name: music-distributed-kv-store-csit jobs: - - '{project-name}-{stream}-project-csit-PoC' - - '{project-name}-unified-review-{stream}-PoC' - - '{project-name}-unified-merge-{stream}-PoC' + - '{project-name}-{stream}-project-csit' + - '{project-name}-review-verification-{stream}' + - '{project-name}-merge-verification-{stream}' project-name: 'music-distributed-kv-store' project: 'music/distributed-kv-store' stream: 'master' diff --git a/jjb/music/music-distributed-kv-store.yaml b/jjb/music/music-distributed-kv-store.yaml index d01f599e9..6812484a2 100644 --- a/jjb/music/music-distributed-kv-store.yaml +++ b/jjb/music/music-distributed-kv-store.yaml @@ -9,10 +9,10 @@ - '{project-name}-{stream}-docker-golang-shell-daily': script: !include-raw-escape: 'build-music-distributed-kv-store-image.sh' - - '{project-name}-{stream}-golang-docker-snapshot-PoC': + - '{project-name}-{stream}-golang-docker-snapshot': script: !include-raw-escape: 'build-music-distributed-kv-store-image.sh' - - '{project-name}-{stream}-docker-staging-PoC': + - '{project-name}-{stream}-docker-staging': script: !include-raw-escape: 'tag-music-distributed-kv-store-image-staging.sh' project: 'music/distributed-kv-store' diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml index ca2279eff..c4c388fa2 100644 --- a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml @@ -8,6 +8,8 @@ stream: - "master": branch: "master" + - "guilin": + branch: "guilin" functionality: - "certservice": trigger_jobs: 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 5bcd5f327..d4602e354 100644 --- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml @@ -20,6 +20,9 @@ - 'master': branch: 'master' java-version: openjdk11 + - 'guilin': + branch: 'guilin' + java-version: openjdk11 project: 'oom/platform/cert-service' mvn-settings: 'oom-platform-cert-service-settings' files: '**' diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 789f7e7d9..3fb14c94d 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -91,9 +91,11 @@ jobs: - '{project-name}-{stream}-image-verify': files: '**' + build-timeout: 240 - '{project-name}-{stream}-verify-helm': build_script: '{oom_build_script}' files: '**' + build-timeout: 240 - '{project-name}-{stream}-merge-helm': build_script: '{oom_build_script}' post_build_script: !include-raw-escape: shell/publish_helm_charts.sh diff --git a/jjb/oom/oom-image-verify.yaml b/jjb/oom/oom-image-verify.yaml index 058f4ee4f..8ac6e3a25 100644 --- a/jjb/oom/oom-image-verify.yaml +++ b/jjb/oom/oom-image-verify.yaml @@ -11,7 +11,6 @@ pre_build_script: '' submodule-disable: false submodule-timeout: 10 - build-timeout: 180 project-type: freestyle node: '{build-node}' |