diff options
Diffstat (limited to 'jjb/multicloud')
5 files changed, 37 insertions, 7 deletions
diff --git a/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh index 0a8f304ad..6cfe920ed 100644 --- a/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh +++ b/jjb/multicloud/build-multicloud-openstack-vmware-docker-image.sh @@ -9,6 +9,3 @@ chmod 755 ./vio/docker/*.* ./vio/docker/build_image.sh -echo '========================== Building docker for vesagent ==========================' -chmod 755 ./vesagent/docker/*.* -./vesagent/docker/docker-build.sh diff --git a/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh new file mode 100644 index 000000000..bdb5a849c --- /dev/null +++ b/jjb/multicloud/build-multicloud-openstack-vmware-vesagent-docker-image.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +echo '========================== Building docker for vesagent ==========================' +chmod 755 ./vesagent/docker/*.* +./vesagent/docker/docker-build.sh diff --git a/jjb/multicloud/multicloud-framework-java.yaml b/jjb/multicloud/multicloud-framework-java.yaml index 6535e8420..9f140ced5 100644 --- a/jjb/multicloud/multicloud-framework-java.yaml +++ b/jjb/multicloud/multicloud-framework-java.yaml @@ -14,6 +14,7 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-release-version-java-daily-no-sonar' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/multicloud/multicloud-openstack-vmware-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-java.yaml index e2c4ec889..6b6e9a648 100644 --- a/jjb/multicloud/multicloud-openstack-vmware-java.yaml +++ b/jjb/multicloud/multicloud-openstack-vmware-java.yaml @@ -11,13 +11,10 @@ - 'vio': pom: 'vio/pom.xml' pattern: 'vio/**' - - 'vesagent': - pom: 'vesagent/pom.xml' - pattern: 'vesagent/**' jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar' - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' mvn-goals: 'install' diff --git a/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml new file mode 100644 index 000000000..5e141a905 --- /dev/null +++ b/jjb/multicloud/multicloud-openstack-vmware-vesagent-java.yaml @@ -0,0 +1,25 @@ +--- +- project: + name: multicloud-openstack-vmware-vesagent-java + project-name: 'multicloud-openstack-vmware-vesagent' + project: 'multicloud/openstack/vmware' + stream: + - 'master': + branch: 'master' + mvn-settings: 'multicloud-openstack-vmware-settings' + subproject: + - 'vesagent': + pom: 'vesagent/pom.xml' + pattern: 'vesagent/**' + jobs: + - '{project-name}-{stream}-{subproject}-verify-java' + - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-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-vmware-vesagent-docker-image.sh' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g |