diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-08-16 10:54:17 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-08-16 10:54:17 -0400 |
| commit | ffa45c8bc831482e3c121b1b10c7630ad2f2a474 (patch) | |
| tree | f3458d578c436af8d33421bb59f88b69d6a5f00b | |
| parent | 5363b02a9d3237b96bcc24a7723264269ba5ed10 (diff) | |
Config SDNC to use maven 3.5
Configured SDNC jobs to use mvn version 3.5. Also, removed obsolete
old (pre-global-jjb) docker build.
Change-Id: Ie3466d893404f96644a4ca0b3ac215e1a395f843
Issue-ID: CIMAN-296
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
| -rw-r--r-- | jjb/sdnc/sdnc-apps.yaml | 18 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-northbound.yaml | 2 | ||||
| -rw-r--r-- | jjb/sdnc/sdnc-oam.yaml | 17 |
3 files changed, 5 insertions, 32 deletions
diff --git a/jjb/sdnc/sdnc-apps.yaml b/jjb/sdnc/sdnc-apps.yaml index a519ad361..739beaf5b 100644 --- a/jjb/sdnc/sdnc-apps.yaml +++ b/jjb/sdnc/sdnc-apps.yaml @@ -36,6 +36,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' + maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g - project: @@ -50,23 +51,8 @@ mvn-settings: 'sdnc-apps-settings' mvn-goals: 'clean install' mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' + maven-version: "mvn35" -- project: - name: sdnc-apps-docker - project-name: 'sdnc-apps' - jobs: - - 'docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - project: 'sdnc/apps' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdnc-apps-settings' - files: '**' - archive-artifacts: '' - build-node: queue-docker-4c-4g # #- project: # name: sdnc-apps-docker-arm64 diff --git a/jjb/sdnc/sdnc-northbound.yaml b/jjb/sdnc/sdnc-northbound.yaml index 88b407a9e..a65e78065 100644 --- a/jjb/sdnc/sdnc-northbound.yaml +++ b/jjb/sdnc/sdnc-northbound.yaml @@ -24,6 +24,7 @@ deployAtEnd=true files: '**' archive-artifacts: '' + maven-version: "mvn35" build-node: ubuntu1604-builder-4c-4g - project: @@ -37,6 +38,7 @@ branch: 'master' mvn-settings: 'sdnc-northbound-settings' mvn-goals: 'clean install' + maven-version: "mvn35" mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - project: diff --git a/jjb/sdnc/sdnc-oam.yaml b/jjb/sdnc/sdnc-oam.yaml index 4af3a3130..695fa4ba1 100644 --- a/jjb/sdnc/sdnc-oam.yaml +++ b/jjb/sdnc/sdnc-oam.yaml @@ -24,26 +24,11 @@ - 'master': branch: 'master' mvn-settings: 'sdnc-oam-settings' + maven-version: "mvn35" files: '**' archive-artifacts: '' build-node: ubuntu1604-builder-4c-4g -- project: - name: sdnc-oam-docker - project-name: 'sdnc-oam' - jobs: - - 'docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - mvn-params: '-Dmaven.test.skip=true' - project: 'sdnc/oam' - stream: - - 'master': - branch: 'master' - mvn-settings: 'sdnc-oam-settings' - files: '**' - archive-artifacts: '' - build-node: queue-docker-4c-4g # #- project: # name: sdnc-oam-docker-arm64 |