diff options
Diffstat (limited to 'jjb')
30 files changed, 358 insertions, 63 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 4a68af135..5c7e4622e 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -22,8 +22,8 @@ - 'master': branch: 'master' mvn-params: '-P spring-boot-2-1' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-params: '-P spring-boot-2-1' mvn-settings: 'aai-aai-common-settings' mvn-version: 'mvn35' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 13799a59b..c886251b8 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -24,8 +24,8 @@ build-node: centos7-docker-8c-8g project: 'aai/babel' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-babel-settings' diff --git a/jjb/aai/aai-cacher.yaml b/jjb/aai/aai-cacher.yaml index ec4b2bd0b..ca9d19dd5 100644 --- a/jjb/aai/aai-cacher.yaml +++ b/jjb/aai/aai-cacher.yaml @@ -20,8 +20,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'aai-cacher-settings' mvn-version: 'mvn35' files: '**' diff --git a/jjb/aai/aai-data-router.yaml b/jjb/aai/aai-data-router.yaml index 823dab737..d273e073b 100644 --- a/jjb/aai/aai-data-router.yaml +++ b/jjb/aai/aai-data-router.yaml @@ -24,8 +24,8 @@ build-node: centos7-docker-8c-8g project: 'aai/data-router' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-data-router-settings' diff --git a/jjb/aai/aai-event-client.yaml b/jjb/aai/aai-event-client.yaml index 08ccd0e77..039317c19 100644 --- a/jjb/aai/aai-event-client.yaml +++ b/jjb/aai/aai-event-client.yaml @@ -19,8 +19,8 @@ build-node: centos7-docker-8c-8g project: 'aai/event-client' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-event-client-settings' diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index 1278ed695..7a7b9cfa2 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -26,8 +26,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'aai-graphadmin-settings' mvn-version: 'mvn35' files: '**' diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index c1cdbe457..a4fbaeaeb 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -19,8 +19,8 @@ build-node: centos7-docker-8c-8g project: 'aai/logging-service' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-logging-service-settings' diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 84e2a3e6b..d89a19cd5 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -24,8 +24,8 @@ build-node: centos7-docker-8c-8g project: 'aai/model-loader' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-model-loader-settings' diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index fee95b499..b53b378cd 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -26,8 +26,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'aai-resources-settings' mvn-version: 'mvn35' files: '**' diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index c641d987a..76be4bfba 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -19,8 +19,8 @@ build-node: centos7-docker-8c-8g project: 'aai/rest-client' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-rest-client-settings' diff --git a/jjb/aai/aai-router-core-service.yaml b/jjb/aai/aai-router-core-service.yaml index 316c5dd7b..fddff15e3 100644 --- a/jjb/aai/aai-router-core-service.yaml +++ b/jjb/aai/aai-router-core-service.yaml @@ -19,8 +19,8 @@ build-node: centos7-docker-8c-8g project: 'aai/router-core' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-router-core-settings' diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 24c640eeb..dbea8ee73 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -26,8 +26,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'aai-schema-service-settings' mvn-version: 'mvn35' files: '**' diff --git a/jjb/aai/aai-search-data-service.yaml b/jjb/aai/aai-search-data-service.yaml index 1d68ea571..b6139d25d 100644 --- a/jjb/aai/aai-search-data-service.yaml +++ b/jjb/aai/aai-search-data-service.yaml @@ -25,8 +25,8 @@ project: 'aai/search-data-service' docker-image-name: 'onap/search-data-service' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-search-data-service-settings' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 49c994141..0a4647835 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -24,8 +24,8 @@ build-node: centos7-docker-8c-8g project: 'aai/sparky-be' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-sparky-be-settings' diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index 4ac85e0e1..03fd1fad3 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -13,8 +13,8 @@ build-node: centos7-docker-8c-8g project: 'aai/sparky-fe' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-sparky-fe-settings' diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index b6178bb5e..7774e76f2 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -26,8 +26,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'aai-traversal-settings' mvn-version: 'mvn35' files: '**' diff --git a/jjb/aai/aai-validation.yaml b/jjb/aai/aai-validation.yaml index 2fab17bd5..3f40d31e4 100644 --- a/jjb/aai/aai-validation.yaml +++ b/jjb/aai/aai-validation.yaml @@ -24,8 +24,8 @@ build-node: centos7-docker-8c-8g project: 'aai/validation' stream: - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' - 'master': branch: 'master' mvn-settings: 'aai-validation-settings' diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml index 7f961a56d..c6206524e 100644 --- a/jjb/cps/cps.yaml +++ b/jjb/cps/cps.yaml @@ -12,3 +12,68 @@ build-node: centos7-builder-2c-1g jobs: - gerrit-info-yaml-verify + +- project: + name: cps-clm + java-version: openjdk11 + mvn-version: "mvn36" + maven-version: "mvn36" + jobs: + - gerrit-maven-clm + nexus-iq-namespace: 'onap-' + project: 'cps' + project-name: 'cps' + branch: 'master' + mvn-settings: 'cps-settings' + build-node: ubuntu1804-builder-4c-4g + +- project: + name: cps + java-version: openjdk11 + mvn-version: "mvn36" + maven-version: "mvn36" + project-name: 'cps' + project: 'cps' + 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 + - gerrit-maven-docker-stage: + build-node: centos7-docker-8c-8g + maven-versions-plugin: true + mvn-params: '-P docker' + 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-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1804-builder-4c-4g + +- project: + name: cps-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: ubuntu1804-builder-4c-4g + project: 'cps' + project-name: 'cps' + branch: 'master' + mvn-settings: 'cps-settings' + mvn-goals: 'clean install' + mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' diff --git a/jjb/global-templates-golang.yaml b/jjb/global-templates-golang.yaml index 4d48b871f..c85c74ac0 100644 --- a/jjb/global-templates-golang.yaml +++ b/jjb/global-templates-golang.yaml @@ -169,7 +169,8 @@ branch: '{branch}' refspec: 'refs/heads/{branch}' artifacts: '{archive-artifacts}' - + - integration-unique-docker-tag: + unique-docker-tag: '' scm: - gerrit-trigger-scm: refspec: '' diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml index a6d3695ea..b4728463e 100644 --- a/jjb/integration/integration-macros.yaml +++ b/jjb/integration/integration-macros.yaml @@ -47,6 +47,14 @@ default: '{terragrunt-version}' description: 'Terragrunt version to install on minion' +- parameter: + name: integration-unique-docker-tag + parameters: + - string: + name: UNIQUE_DOCKER_TAG + default: '{unique-docker-tag}' + description: 'Unique docker tag to identify specific version' + - builder: name: integration-install-robotframework builders: @@ -60,6 +68,11 @@ - shell: "${WORKSPACE}/run-csit.sh ${TESTPLAN} ${TESTOPTIONS}" - builder: + name: integration-run-project-test + builders: + - shell: "${WORKSPACE}/csit/run-project-csit.sh ${TESTPLAN} ${TESTOPTIONS}" + +- builder: name: integration-autorelease-fix-relativepaths builders: - shell: "${WORKSPACE}/autorelease/scripts/fix-relativepaths.sh" @@ -124,6 +137,16 @@ only-critical: false - publisher: + name: integration-project-robot + publishers: + - robot: + output-path: 'csit/archives' + other-files: '' + unstable-threshold: '{unstable-if}' + pass-threshold: '{pass-if}' + only-critical: false + +- publisher: name: integration-docker-compose-logs publishers: - postbuildscript: diff --git a/jjb/integration/integration-templates-csit.yaml b/jjb/integration/integration-templates-csit.yaml index f5961eb3e..3ae98a29c 100644 --- a/jjb/integration/integration-templates-csit.yaml +++ b/jjb/integration/integration-templates-csit.yaml @@ -8,6 +8,7 @@ node: '{build-node}' recipients: '' java-version: 'openjdk11' + python-version: python3 properties: - lf-infra-properties: @@ -70,6 +71,7 @@ node: '{build-node}' recipients: '' java-version: 'openjdk11' + python-version: python3 properties: - lf-infra-properties: @@ -109,6 +111,7 @@ jobs: '{obj:trigger_jobs}' builders: + - lf-infra-pre-build - lf-update-java-alternatives: java-version: '{java-version}' - integration-install-robotframework @@ -126,3 +129,122 @@ notify-every-unstable-build: false send-to-individuals: true +- job-template: + name: '{project-name}-{stream}-project-csit-{functionality}' + disabled: '{disabled}' + + project-type: freestyle + build-node: 'ubuntu1804-docker-8c-8g' + node: '{build-node}' + recipients: '' + java-version: 'openjdk11' + python-version: python3 + + properties: + - lf-infra-properties: + project: '{project}' + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + - integration-test-plan: + test-plan: 'plans/{functionality}' + - integration-test-options: + test-options: '{robot-options}' + + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + builders: + - 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: + - integration-project-robot: + unstable-if: 0.0 + pass-if: 100.0 + - lf-infra-publish + - email: + recipients: '{recipients}' + notify-every-unstable-build: false + send-to-individuals: true + +- job-template: + name: '{project-name}-unified-review-{stream}-test' + disabled: '{disabled}' + project-type: freestyle + build-node: 'ubuntu1804-docker-8c-8g' + java-version: 'openjdk11' + + properties: + - lf-infra-properties: + project: '{project}' + build-days-to-keep: '{build-days-to-keep}' + parameters: + - infra-parameters: + project: '{project}' + branch: '{branch}' + refspec: 'refs/heads/{branch}' + artifacts: '{archive-artifacts}' + scm: + - gerrit-trigger-scm: + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + submodule-recursive: '{submodule-recursive}' + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + builders: + - lf-infra-pre-build + - lf-maven-install: + mvn-version: "{mvn-version}" + - lf-update-java-alternatives: + java-version: "{java-version}" + - lf-provide-maven-settings: + global-settings-file: "{mvn-global-settings}" + settings-file: "{mvn-settings}" + - trigger-builds: + - project: "{project-name}-{stream}-docker-golang-shell-daily" + condition: UNSTABLE_OR_BETTER + predefined-parameters: | + UNIQUE_DOCKER_TAG=$BUILD_TAG + PROJECT=$PROJECT + BRANCH=$BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + block: true + - trigger-builds: + - project: '{project-name}-{stream}-project-csit-{review-functionality}' + condition: UNSTABLE_OR_BETTER + predefined-parameters: | + UNIQUE_DOCKER_TAG=$BUILD_TAG + PROJECT=$PROJECT + BRANCH=$BRANCH + GERRIT_REFSPEC=$GERRIT_REFSPEC + block: true + triggers: + - gerrit-trigger-patch-submitted: + server: '{server-name}' + project: '{project}' + branch: '{branch}' + files: '**' + publishers: + - lf-infra-publish + diff --git a/jjb/integration/integration-terragrunt.yaml b/jjb/integration/integration-terragrunt.yaml new file mode 100644 index 000000000..922fbc145 --- /dev/null +++ b/jjb/integration/integration-terragrunt.yaml @@ -0,0 +1,46 @@ +--- +- project: + name: integration-terragrunt-project-view + project-name: integration-terragrunt + views: + - project-view + +- project: + name: integration-terragrunt-info + project: integration/terragrunt + project-name: integration-terragrunt + build-node: centos7-builder-2c-1g + jobs: + - gerrit-info-yaml-verify + +- project: + name: integration-terragrunt-linters + project: integration/terragrunt + project-name: integration-terragrunt + python-version: python3 + jobs: + - integration-linters + subproject: + - 'yaml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yaml' + - 'yml': + tox-dir: '.' + tox-envs: 'yaml' + pattern: '**/*.yml' + - 'json': + tox-dir: '.' + tox-envs: 'json' + pattern: '**/*.json' + - 'python': + tox-dir: '.' + tox-envs: 'py' + pattern: '**/*.py' + - 'md': + tox-dir: '.' + tox-envs: 'md' + pattern: '**/*.md' + stream: + - 'master': + branch: 'master' diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml index 5cbce4e84..3fb927c06 100644 --- a/jjb/integration/xtesting/integration-xtesting.yaml +++ b/jjb/integration/xtesting/integration-xtesting.yaml @@ -106,6 +106,12 @@ - 'frankfurt': branch: 'frankfurt' files: '' + - 'guilin': + branch: 'guilin' + files: '' + - 'develop': + branch: 'develop' + files: '' docker-root: '$WORKSPACE' mvn-settings: 'integration-settings' build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/music/build-music-distributed-kv-store-image.sh b/jjb/music/build-music-distributed-kv-store-image.sh index d11f0534d..69a7785c1 100755 --- a/jjb/music/build-music-distributed-kv-store-image.sh +++ b/jjb/music/build-music-distributed-kv-store-image.sh @@ -1,9 +1,10 @@ #!/bin/bash echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' +echo "============== Unique docker tag: ${UNIQUE_DOCKER_TAG}" CURRENTDIR="$(pwd)" echo $CURRENTDIR chmod 755 ./deployment/*.sh cd ./deployment -./docker-build.sh +./docker-build.sh ${UNIQUE_DOCKER_TAG} diff --git a/jjb/music/music-distributed-kv-store-csit.yaml b/jjb/music/music-distributed-kv-store-csit.yaml index 7c13ebe51..95512679d 100644 --- a/jjb/music/music-distributed-kv-store-csit.yaml +++ b/jjb/music/music-distributed-kv-store-csit.yaml @@ -2,13 +2,17 @@ - project: name: music-distributed-kv-store-csit jobs: - - '{project-name}-{stream}-verify-csit-{functionality}' - - '{project-name}-{stream}-csit-{functionality}' - project-name: 'music' - disabled: true + - '{project-name}-{stream}-project-csit-{functionality}' + - '{project-name}-unified-review-{stream}-test' + project-name: 'music-distributed-kv-store' + project: 'music/distributed-kv-store' stream: 'master' + java-version: openjdk11 + mvn-version: 'mvn36' + mvn-settings: 'music-distributed-kv-store-settings' + mvn-global-settings: global-settings functionality: - - 'music-distributed-kv-store-test-plan': - trigger_jobs: 'music-distributed-kv-store-master-docker-golang-shell-daily' + - 'music-distributed-kv-store-test-plan' + review-functionality: 'music-distributed-kv-store-test-plan' robot-options: '' branch: 'master' diff --git a/jjb/oom/oom-image-verify.yaml b/jjb/oom/oom-image-verify.yaml index 58240f92a..058f4ee4f 100644 --- a/jjb/oom/oom-image-verify.yaml +++ b/jjb/oom/oom-image-verify.yaml @@ -1,9 +1,39 @@ --- - job-template: name: '{project-name}-{stream}-image-verify' - project-type: freestyle - path: '$WORKSPACE' concurrent: true + branch: master + submodule-recursive: true + + build_script: '' + git-url: '$GIT_URL/$PROJECT' + post_build_script: '' + pre_build_script: '' + submodule-disable: false + submodule-timeout: 10 + build-timeout: 180 + + project-type: freestyle + node: '{build-node}' + + properties: + - lf-infra-properties: + build-days-to-keep: '{build-days-to-keep}' + + parameters: + - lf-infra-parameters: + branch: '{branch}' + project: '{project}' + stream: '{stream}' + lftools-version: '{lftools-version}' + + wrappers: + - lf-infra-wrappers: + build-timeout: '{build-timeout}' + jenkins-ssh-credential: '{jenkins-ssh-credential}' + + publishers: + - lf-infra-publish scm: - gerrit-trigger-scm: @@ -21,7 +51,4 @@ builders: - lf-infra-pre-build - - shell: 'make check-for-staging-images | true' - - publishers: - - infra-shiplogs: + - shell: 'cd kubernetes; make check-for-staging-images 2>&1' diff --git a/jjb/optf/optf-cmso.yaml b/jjb/optf/optf-cmso.yaml index 88c2384e2..2a31f8f95 100644 --- a/jjb/optf/optf-cmso.yaml +++ b/jjb/optf/optf-cmso.yaml @@ -31,8 +31,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'optf-cmso-settings' java-version: openjdk11 @@ -74,8 +74,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'optf-cmso-settings' java-version: openjdk11 diff --git a/jjb/optf/optf-has.yaml b/jjb/optf/optf-has.yaml index 516ec8495..28bb2006b 100644 --- a/jjb/optf/optf-has.yaml +++ b/jjb/optf/optf-has.yaml @@ -6,8 +6,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'optf-has-settings' subproject: - 'conductor': @@ -66,8 +66,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'optf-has-settings' - project: diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml index c5a91f272..a81fac786 100644 --- a/jjb/optf/optf-osdf.yaml +++ b/jjb/optf/optf-osdf.yaml @@ -7,8 +7,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'optf-osdf-settings' subproject: - 'osdf': @@ -67,8 +67,8 @@ stream: - 'master': branch: 'master' - - 'frankfurt': - branch: 'frankfurt' + - 'guilin': + branch: 'guilin' mvn-settings: 'optf-osdf-settings' - project: diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index d3cc5fe01..21a9155af 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -21,7 +21,7 @@ container-public-registry: 'nexus3.onap.org:10001' container-staging-registry: 'nexus3.onap.org:10003' mvn-params: '-Dmaven.test.skip=true -P docker' - maven-version: "mvn35" + maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -43,7 +43,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -65,7 +65,7 @@ mvn-settings: 'sdnc-apps-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" + maven-version: "mvn36" # #- project: |