diff options
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/ccsdk/apps.yaml | 8 | ||||
-rw-r--r-- | jjb/ccsdk/ccsdk-oran.yaml | 6 | ||||
-rw-r--r-- | jjb/ccsdk/cds.yaml | 13 | ||||
-rw-r--r-- | jjb/ccsdk/dashboard.yaml | 2 | ||||
-rw-r--r-- | jjb/ccsdk/distribution.yaml | 4 | ||||
-rw-r--r-- | jjb/ccsdk/features.yaml | 6 | ||||
-rw-r--r-- | jjb/ccsdk/parent.yaml | 4 | ||||
-rw-r--r-- | jjb/ccsdk/sli-adaptors.yaml | 6 | ||||
-rw-r--r-- | jjb/ccsdk/sli-core.yaml | 6 | ||||
-rw-r--r-- | jjb/ccsdk/sli-northbound.yaml | 6 | ||||
-rw-r--r-- | jjb/ccsdk/sli-plugins.yaml | 6 | ||||
-rw-r--r-- | jjb/integration/xtesting/integration-xtesting.yaml | 21 |
12 files changed, 37 insertions, 51 deletions
diff --git a/jjb/ccsdk/apps.yaml b/jjb/ccsdk/apps.yaml index c6c3f56b1..20a246627 100644 --- a/jjb/ccsdk/apps.yaml +++ b/jjb/ccsdk/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-version: "mvn36" cron: '@daily' - '{project-name}-gerrit-release-jobs': build-node: centos7-docker-8c-8g @@ -40,7 +40,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' @@ -62,7 +62,7 @@ mvn-settings: 'ccsdk-apps-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" + maven-version: "mvn36" - project: name: ccsdk-apps-clm @@ -77,7 +77,7 @@ - 'frankfurt': branch: 'frankfurt' mvn-settings: 'ccsdk-apps-settings' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g #- project: diff --git a/jjb/ccsdk/ccsdk-oran.yaml b/jjb/ccsdk/ccsdk-oran.yaml index aea09bbfd..cc26000bd 100644 --- a/jjb/ccsdk/ccsdk-oran.yaml +++ b/jjb/ccsdk/ccsdk-oran.yaml @@ -16,7 +16,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-version: "mvn36" maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': @@ -28,7 +28,7 @@ mvn-settings: 'ccsdk-oran-settings' files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn36" java-version: openjdk11 docker-pom: 'pom.xml' mvn-profile: docker @@ -61,5 +61,5 @@ mvn-settings: 'ccsdk-oran-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" + maven-version: "mvn36" java-version: openjdk11 diff --git a/jjb/ccsdk/cds.yaml b/jjb/ccsdk/cds.yaml index beb0c1713..4afe8efcc 100644 --- a/jjb/ccsdk/cds.yaml +++ b/jjb/ccsdk/cds.yaml @@ -16,7 +16,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-version: "mvn36" maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': @@ -38,7 +38,8 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn36" + java-version: openjdk11 build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' nexus-snapshot-repo: 'snapshots' @@ -60,7 +61,8 @@ mvn-settings: 'ccsdk-cds-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" + maven-version: "mvn36" + java-version: openjdk11 - project: name: ccsdk-cds-clm @@ -75,7 +77,8 @@ - 'frankfurt': branch: 'frankfurt' mvn-settings: 'ccsdk-cds-settings' - maven-version: "mvn35" + maven-version: "mvn36" + java-version: openjdk11 build-node: ubuntu1804-builder-4c-4g @@ -98,3 +101,5 @@ mvn-clean-install: true project: ccsdk/cds branch: master + maven-version: "mvn36" + java-version: openjdk11 diff --git a/jjb/ccsdk/dashboard.yaml b/jjb/ccsdk/dashboard.yaml index b2ab4577c..317c55101 100644 --- a/jjb/ccsdk/dashboard.yaml +++ b/jjb/ccsdk/dashboard.yaml @@ -16,7 +16,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-version: "mvn36" maven-versions-plugin: true cron: '@daily' diff --git a/jjb/ccsdk/distribution.yaml b/jjb/ccsdk/distribution.yaml index 47e616bf6..760e127a9 100644 --- a/jjb/ccsdk/distribution.yaml +++ b/jjb/ccsdk/distribution.yaml @@ -16,7 +16,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-version: "mvn36" maven-versions-plugin: true cron: '@daily' - '{project-name}-gerrit-release-jobs': @@ -32,7 +32,7 @@ mvn-settings: 'ccsdk-distribution-settings' files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn36" docker-pom: 'pom.xml' mvn-profile: docker build-node: ubuntu1804-docker-8c-8g diff --git a/jjb/ccsdk/features.yaml b/jjb/ccsdk/features.yaml index 17dd0b477..06e4a5597 100644 --- a/jjb/ccsdk/features.yaml +++ b/jjb/ccsdk/features.yaml @@ -27,7 +27,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn36" mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' build-node: ubuntu1804-builder-4c-4g mvn-snapshot-id: 'ecomp-snapshots' @@ -50,7 +50,7 @@ mvn-settings: 'ccsdk-features-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' - maven-version: "mvn35" + maven-version: "mvn36" - project: name: ccsdk-features-clm @@ -66,7 +66,7 @@ branch: 'frankfurt' mvn-settings: 'ccsdk-features-settings' mvn-opts: '-Xmx3072m -XX:MaxPermSize=1024m' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g - project: diff --git a/jjb/ccsdk/parent.yaml b/jjb/ccsdk/parent.yaml index 0d3a3ee2c..7b716f729 100644 --- a/jjb/ccsdk/parent.yaml +++ b/jjb/ccsdk/parent.yaml @@ -29,7 +29,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' - maven-version: "mvn35" + maven-version: "mvn36" - project: name: ccsdk-parent-clm @@ -44,7 +44,7 @@ - 'frankfurt': branch: 'frankfurt' mvn-settings: 'ccsdk-parent-settings' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/ccsdk/sli-adaptors.yaml b/jjb/ccsdk/sli-adaptors.yaml index ad92332ef..012df50af 100644 --- a/jjb/ccsdk/sli-adaptors.yaml +++ b/jjb/ccsdk/sli-adaptors.yaml @@ -30,7 +30,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' @@ -52,7 +52,7 @@ mvn-settings: 'ccsdk-sli-adaptors-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" + maven-version: "mvn36" - project: name: ccsdk-sli-adaptors-clm @@ -67,7 +67,7 @@ - 'frankfurt': branch: 'frankfurt' mvn-settings: 'ccsdk-sli-adaptors-settings' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/ccsdk/sli-core.yaml b/jjb/ccsdk/sli-core.yaml index 0fc6d6c94..e6169e975 100644 --- a/jjb/ccsdk/sli-core.yaml +++ b/jjb/ccsdk/sli-core.yaml @@ -30,7 +30,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' @@ -52,7 +52,7 @@ mvn-settings: 'ccsdk-sli-core-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" + maven-version: "mvn36" - project: name: ccsdk-sli-core-clm @@ -67,7 +67,7 @@ - 'frankfurt': branch: 'frankfurt' mvn-settings: 'ccsdk-sli-core-settings' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/ccsdk/sli-northbound.yaml b/jjb/ccsdk/sli-northbound.yaml index d130cb121..45761e5a9 100644 --- a/jjb/ccsdk/sli-northbound.yaml +++ b/jjb/ccsdk/sli-northbound.yaml @@ -30,7 +30,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' @@ -52,7 +52,7 @@ mvn-settings: 'ccsdk-sli-northbound-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" + maven-version: "mvn36" - project: name: ccsdk-sli-northbound-clm @@ -67,7 +67,7 @@ - 'frankfurt': branch: 'frankfurt' mvn-settings: 'ccsdk-sli-northbound-settings' - maven-version: "mvn35" + maven-version: "mvn36" build-node: ubuntu1804-builder-4c-4g diff --git a/jjb/ccsdk/sli-plugins.yaml b/jjb/ccsdk/sli-plugins.yaml index 4f99ad87d..a6d1cd4fc 100644 --- a/jjb/ccsdk/sli-plugins.yaml +++ b/jjb/ccsdk/sli-plugins.yaml @@ -30,7 +30,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' @@ -52,7 +52,7 @@ mvn-settings: 'ccsdk-sli-plugins-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - maven-version: "mvn35" + maven-version: "mvn36" - project: name: ccsdk-sli-plugins-clm @@ -67,7 +67,7 @@ - 'frankfurt': branch: 'frankfurt' mvn-settings: 'ccsdk-sli-plugins-settings' - maven-version: "mvn35" + maven-version: "mvn36" - project: diff --git a/jjb/integration/xtesting/integration-xtesting.yaml b/jjb/integration/xtesting/integration-xtesting.yaml index 7e634a118..5cbce4e84 100644 --- a/jjb/integration/xtesting/integration-xtesting.yaml +++ b/jjb/integration/xtesting/integration-xtesting.yaml @@ -89,26 +89,6 @@ docker-name: 'onap/xtesting-smoke-usecases-robot' docker-build-args: '-f ./docker/Dockerfile' - gerrit-docker-verify: - project-name: 'integration-xtesting-benchmarking' - docker-root: ./benchmarking - docker-name: 'onap/xtesting-benchmarking' - docker-build-args: '-f ./docker/Dockerfile' - - gerrit-docker-merge: - project-name: 'integration-xtesting-benchmarking' - docker-root: ./benchmarking - docker-name: 'onap/xtesting-benchmarking' - docker-build-args: '-f ./docker/Dockerfile' - - gerrit-docker-verify: - project-name: 'integration-xtesting-candidate-usecases' - docker-root: ./candidate-usecases - docker-name: 'onap/xtesting-candidate-usecases' - docker-build-args: '-f ./docker/Dockerfile' - - gerrit-docker-merge: - project-name: 'integration-xtesting-candidate-usecases' - docker-root: ./candidate-usecases - docker-name: 'onap/xtesting-candidate-usecases' - docker-build-args: '-f ./docker/Dockerfile' - - gerrit-docker-verify: project-name: 'integration-xtesting-security' docker-root: ./security docker-name: 'onap/xtesting-security' @@ -130,3 +110,4 @@ mvn-settings: 'integration-settings' build-node: ubuntu1804-docker-8c-8g cron: '@daily' + container-tag-method: stream |