summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvrvarma <vikas.varma@att.com>2020-03-04 21:29:20 -0500
committervrvarma <vikas.varma@att.com>2020-03-04 21:37:23 -0500
commitbec353e965a9f796d53766296e312d2b978f93e1 (patch)
treeb8071e2905d7ee67e6fd5ea52b9b4b4e5739dab0
parent40298483549c9d288fb7a3c83e4e5c47ff462e5e (diff)
Fix osdf jenkin merge jobs
Moving build-nodes for merge jobs to the newer image Change-Id: Icaa26286f34c053a43e68e1f63016071b8115dc9 Signed-off-by: vrvarma <vikas.varma@att.com> Issue-ID: OPTFRA-713
-rw-r--r--jjb/optf/optf-osdf.yaml37
1 files changed, 3 insertions, 34 deletions
diff --git a/jjb/optf/optf-osdf.yaml b/jjb/optf/optf-osdf.yaml
index 830ac930a..77e421ea6 100644
--- a/jjb/optf/optf-osdf.yaml
+++ b/jjb/optf/optf-osdf.yaml
@@ -17,9 +17,9 @@
pom: 'pom.xml'
jobs:
- '{project-name}-{stream}-{subproject}-verify-python':
- build-node: ubuntu1604-builder-4c-4g
+ build-node: ubuntu1804-builder-4c-4g
- '{project-name}-{stream}-{subproject}-merge-java':
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
- gerrit-maven-stage:
sign-artifacts: true
build-node: centos7-docker-8c-8g
@@ -27,7 +27,7 @@
- '{project-name}-gerrit-release-jobs':
build-node: centos7-docker-8c-8g
- gerrit-maven-docker-stage:
- build-node: ubuntu1604-docker-8c-8g
+ build-node: ubuntu1804-docker-8c-8g
maven-versions-plugin: true
container-public-registry: 'nexus3.onap.org:10001'
container-staging-registry: 'nexus3.onap.org:10003'
@@ -40,37 +40,6 @@
build-node: 'ubuntu1604-builder-4c-4g'
- project:
- name: optf-osdf-docker
- project-name: 'optf-osdf'
- project: 'optf/osdf'
- stream:
- - 'master':
- branch: 'master'
- - 'elalto':
- branch: 'elalto'
- mvn-settings: 'optf-osdf-settings'
- subproject:
- - 'osdf':
- path: '.'
- pattern: '**'
- pom: 'pom.xml'
- jobs:
- - '{project-name}-{stream}-{subproject}-docker-java-version-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- mvn-params: '-Dmaven.test.skip=true'
- script:
- !include-raw-escape: 'build-optf-osdf-docker-image.sh'
- build-node: queue-docker-4c-4g
- - '{project-name}-{stream}-{subproject}-docker-java-shell-daily':
- docker-pom: 'pom.xml'
- mvn-goals: 'install'
- mvn-params: '-Dmaven.test.skip=true'
- script:
- !include-raw-escape: 'build-optf-osdf-docker-image.sh'
- build-node: queue-docker-4c-4g
-
-- project:
name: optf-osdf-sonar
jobs:
- gerrit-maven-sonar