diff options
author | Bin Yang <bin.yang@windriver.com> | 2019-02-21 06:27:27 +0000 |
---|---|---|
committer | Bin Yang <bin.yang@windriver.com> | 2019-02-21 06:36:34 +0000 |
commit | 08bcfdd221f2da6868fde2f38ae701149989c869 (patch) | |
tree | 97ed36a2199ecf65c5724432011e56114cc11c9b /jjb/multicloud | |
parent | 76215fcfcef5c16ca0690417c0d02c9ea4f63a6c (diff) |
Add dedicate build script for casablanca branch
Remove newton jjb since it is eol
Change-Id: I9b9180a8a0cd08fa1fb47df0f15ec0b7b1a6b277
Issue-ID: MULTICLOUD-458
Signed-off-by: Bin Yang <bin.yang@windriver.com>
Diffstat (limited to 'jjb/multicloud')
4 files changed, 19 insertions, 33 deletions
diff --git a/jjb/multicloud/build-multicloud-openstack-casablanca-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-casablanca-docker-image.sh new file mode 100755 index 000000000..82bea50ac --- /dev/null +++ b/jjb/multicloud/build-multicloud-openstack-casablanca-docker-image.sh @@ -0,0 +1,14 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./ocata/docker/*.* +chmod 755 ./windriver/docker/*.* +chmod 755 ./pike/docker/*.* + +./ocata/docker/build_image.sh +./windriver/docker/build_image.sh +./pike/docker/build_image.sh diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh index 26842cb18..e4f69ffd6 100755 --- a/jjb/multicloud/build-multicloud-openstack-docker-image.sh +++ b/jjb/multicloud/build-multicloud-openstack-docker-image.sh @@ -5,13 +5,11 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' CURRENTDIR="$(pwd)" echo $CURRENTDIR -chmod 755 ./newton/docker/*.* chmod 755 ./ocata/docker/*.* chmod 755 ./windriver/docker/*.* chmod 755 ./pike/docker/*.* chmod 755 ./starlingx/docker/*.* -./newton/docker/build_image.sh ./ocata/docker/build_image.sh ./windriver/docker/build_image.sh ./pike/docker/build_image.sh diff --git a/jjb/multicloud/multicloud-openstack-casablanca.yaml b/jjb/multicloud/multicloud-openstack-casablanca.yaml index bbe90c551..bfe7d010d 100644 --- a/jjb/multicloud/multicloud-openstack-casablanca.yaml +++ b/jjb/multicloud/multicloud-openstack-casablanca.yaml @@ -8,14 +8,6 @@ branch: 'casablanca' mvn-settings: 'multicloud-openstack-settings' subproject: - - 'newton': - path: 'newton' - pattern: 'newton/**' - pom: 'newton/pom.xml' - - 'newton_share': - path: 'newton' - pattern: 'share/**' - pom: 'newton/pom.xml' - 'ocata': path: 'ocata' pattern: 'ocata/**' @@ -45,7 +37,7 @@ docker-pom: 'pom.xml' mvn-goals: 'install' script: - !include-raw-escape: 'build-multicloud-openstack-docker-image.sh' + !include-raw-escape: 'build-multicloud-openstack-casablanca-docker-image.sh' build-node: ubuntu1604-docker-8c-8g files: '**' archive-artifacts: '' diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml index 891a7b43c..1a8bde82e 100644 --- a/jjb/multicloud/multicloud-openstack.yaml +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -14,14 +14,6 @@ branch: 'master' mvn-settings: 'multicloud-openstack-settings' subproject: - - 'newton': - path: 'newton' - pattern: 'newton/**' - pom: 'newton/pom.xml' - - 'newton_share': - path: 'newton' - pattern: 'share/**' - pom: 'newton/pom.xml' - 'ocata': path: 'ocata' pattern: 'ocata/**' @@ -50,6 +42,10 @@ path: 'windriver' pattern: 'windriver/**' pom: 'windriver/pom.xml' + - 'windriver_share': + path: 'windriver' + pattern: 'share/**' + pom: 'windriver/pom.xml' jobs: - '{project-name}-{stream}-{subproject}-verify-python' - '{project-name}-{stream}-{subproject}-verify-java' @@ -84,20 +80,6 @@ # archive-artifacts: '' # - project: - name: multicloud-openstack-newton-sonar - jobs: - - gerrit-maven-sonar - cron: '@daily' - build-node: ubuntu1604-builder-4c-4g - project: 'multicloud/openstack' - project-name: 'multicloud-openstack-newton' - branch: 'master' - mvn-params: '-f newton/pom.xml' - mvn-settings: 'multicloud-openstack-settings' - mvn-goals: 'clean install' - mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m' - -- project: name: multicloud-openstack-ocata-sonar jobs: - gerrit-maven-sonar |