diff options
Diffstat (limited to 'jjb/multicloud')
| -rwxr-xr-x | jjb/multicloud/build-multicloud-openstack-docker-image.sh | 2 | ||||
| -rw-r--r-- | jjb/multicloud/multicloud-openstack-casablanca.yaml | 54 | ||||
| -rw-r--r-- | jjb/multicloud/multicloud-openstack.yaml | 26 |
3 files changed, 4 insertions, 78 deletions
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 deleted file mode 100644 index bbe90c551..000000000 --- a/jjb/multicloud/multicloud-openstack-casablanca.yaml +++ /dev/null @@ -1,54 +0,0 @@ ---- -- project: - name: multicloud-openstack-casablanca - project-name: 'multicloud-openstack-casablanca' - project: 'multicloud/openstack' - stream: - - 'casablanca': - 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/**' - pom: 'ocata/pom.xml' - - 'ocata_share': - path: 'ocata' - pattern: 'share/**' - pom: 'ocata/pom.xml' - - 'pike': - path: 'pike' - pattern: 'pike/**' - pom: 'pike/pom.xml' - - 'pike_share': - path: 'pike' - pattern: 'share/**' - pom: 'pike/pom.xml' - - 'windriver': - path: 'windriver' - pattern: 'windriver/**' - pom: 'windriver/pom.xml' - jobs: - - '{project-name}-{stream}-{subproject}-verify-python' - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-{subproject}-release-version-java-daily' - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-multicloud-openstack-docker-image.sh' - build-node: ubuntu1604-docker-8c-8g - files: '**' - archive-artifacts: '' - build-node: 'ubuntu1604-memcached-4c-4g' - - 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 |