diff options
| -rw-r--r-- | jjb/holmes/holmes-common.yaml | 4 | ||||
| -rw-r--r-- | jjb/holmes/holmes-dsa.yaml | 4 | ||||
| -rw-r--r-- | jjb/holmes/holmes-engine-mgt.yaml | 4 | ||||
| -rw-r--r-- | jjb/holmes/holmes-rule-mgt.yaml | 4 | ||||
| -rw-r--r-- | jjb/msb/build-docker-image.sh | 10 | ||||
| -rw-r--r-- | jjb/msb/msb-apigateway.yaml | 5 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml (renamed from jjb/vfc/vfc-driver-svnfm-huawei.yaml) | 4 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-resmanagement.yaml | 5 |
8 files changed, 20 insertions, 20 deletions
diff --git a/jjb/holmes/holmes-common.yaml b/jjb/holmes/holmes-common.yaml index 797fb76b5..ebd8ef381 100644 --- a/jjb/holmes/holmes-common.yaml +++ b/jjb/holmes/holmes-common.yaml @@ -6,10 +6,6 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'holmes/common' stream: diff --git a/jjb/holmes/holmes-dsa.yaml b/jjb/holmes/holmes-dsa.yaml index 46400d815..f795f324c 100644 --- a/jjb/holmes/holmes-dsa.yaml +++ b/jjb/holmes/holmes-dsa.yaml @@ -6,10 +6,6 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'holmes/dsa' stream: diff --git a/jjb/holmes/holmes-engine-mgt.yaml b/jjb/holmes/holmes-engine-mgt.yaml index 74d2ce5cd..3b18f85da 100644 --- a/jjb/holmes/holmes-engine-mgt.yaml +++ b/jjb/holmes/holmes-engine-mgt.yaml @@ -6,10 +6,6 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'holmes/engine-management' stream: diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index d71940271..01f553c23 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -6,10 +6,6 @@ - '{project-name}-{stream}-clm' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - - '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-stage-site-java': - site-pom: 'pom.xml' - trigger-job: '{project-name}-{stream}-release-version-java-daily' project: 'holmes/rule-management' stream: diff --git a/jjb/msb/build-docker-image.sh b/jjb/msb/build-docker-image.sh new file mode 100644 index 000000000..9821bfca2 --- /dev/null +++ b/jjb/msb/build-docker-image.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 *.* + +./build4docker.sh diff --git a/jjb/msb/msb-apigateway.yaml b/jjb/msb/msb-apigateway.yaml index 3fc8bb6bc..54f178562 100644 --- a/jjb/msb/msb-apigateway.yaml +++ b/jjb/msb/msb-apigateway.yaml @@ -10,6 +10,11 @@ - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{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-docker-image.sh' project: 'msb/apigateway' stream: diff --git a/jjb/vfc/vfc-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index bf2ec6e43..77e16f973 100644 --- a/jjb/vfc/vfc-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -1,12 +1,12 @@ --- - project: - name: vfc-nfvo-driver-svnfm-Huawei + name: vfc-nfvo-driver-svnfm-huawei project-name: 'vfc-nfvo-driver-svnfm' project: 'vfc/nfvo/driver/vnfm/svnfm' stream: - 'master': branch: 'master' - mvn-settings: 'vfc-nfvo-driver-svnfm-settings' + mvn-settings: 'vfc-nfvo-driver-svnfm-huawei-settings' subproject: - 'drv-vnfm-huawei': pom: 'huawei/vnfmadapter/pom.xml' diff --git a/jjb/vfc/vfc-nfvo-resmanagement.yaml b/jjb/vfc/vfc-nfvo-resmanagement.yaml index e332a5a78..1f364da27 100644 --- a/jjb/vfc/vfc-nfvo-resmanagement.yaml +++ b/jjb/vfc/vfc-nfvo-resmanagement.yaml @@ -2,14 +2,15 @@ - project: name: vfc-nfvo-resmanagement - project-name: 'vfc-nfvo-resmanagement' project: 'vfc/nfvo/resmanagement' + project-name: 'vfc-nfvo-resmanagement' + mvn-settings: 'vfc-nfvo-resmanagement-settings' stream: - 'master': branch: 'master' - 'release-1.0.0': branch: 'release-1.0.0' - mvn-settings: 'vfc-nfvo-resmanagement-settings' build-node: ubuntu1604-basebuild-4c-4g jobs: - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' |