diff options
author | 2017-09-07 18:48:39 +0000 | |
---|---|---|
committer | 2017-09-07 18:48:39 +0000 | |
commit | 0320aba424209b3354d166bc834642b55e8be4d3 (patch) | |
tree | 46cb9a82cf11cc0427d44947c2745dbe78b3a8c2 | |
parent | 92af37b945200ea18a82c8b58ca793d60df6f339 (diff) | |
parent | 4505c3038d4d4a97633d2bce9bb42c30745624da (diff) |
Merge "Merge svnfm docker build Job"
-rwxr-xr-x | jjb/vfc/build-driver-svnfm-zte-docker-image.sh | 11 | ||||
-rwxr-xr-x | jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh (renamed from jjb/vfc/build-svnfm-huawei-docker-image.sh) | 5 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml | 5 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml | 19 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml | 5 |
5 files changed, 22 insertions, 23 deletions
diff --git a/jjb/vfc/build-driver-svnfm-zte-docker-image.sh b/jjb/vfc/build-driver-svnfm-zte-docker-image.sh deleted file mode 100755 index fbc6756a8..000000000 --- a/jjb/vfc/build-driver-svnfm-zte-docker-image.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash -# -echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' - -CURRENTDIR="$(pwd)" -echo $CURRENTDIR - -chmod 755 ./zte/vmanager/docker/*.* - -./zte/vmanager/docker/build_image.sh - diff --git a/jjb/vfc/build-svnfm-huawei-docker-image.sh b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh index 964043019..417082b98 100755 --- a/jjb/vfc/build-svnfm-huawei-docker-image.sh +++ b/jjb/vfc/build-nfvo-svnfm-driver-docker-image.sh @@ -5,7 +5,8 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' CURRENTDIR="$(pwd)" echo $CURRENTDIR -chmod 755 ./VnfmadapterService/docker/*.* +chmod 755 ./zte/vmanager/docker/*.* +./zte/vmanager/docker/build_image.sh +chmod 755 ./VnfmadapterService/docker/*.* ./VnfmadapterService/docker/build_image.sh - diff --git a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml index 36632508c..db40e10c8 100644 --- a/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml +++ b/jjb/vfc/vfc-nfvo-driver-svnfm-huawei.yaml @@ -15,11 +15,6 @@ - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - '{project-name}-{stream}-{subproject}-release-java-daily' - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'huawei/vnfmadapter/pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-svnfm-huawei-docker-image.sh' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml new file mode 100644 index 000000000..8698735ff --- /dev/null +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-docker-java.yaml @@ -0,0 +1,19 @@ +--- + +- project: + name: vfc-nfvo-driver-vnfm-svnfm-docker + project-name: 'vfc-nfvo-driver-vnfm-svnfm' + project: 'vfc/nfvo/driver/vnfm/svnfm' + stream: + - 'master': + branch: 'master' + mvn-settings: 'vfc-nfvo-driver-vnfm-svnfm-settings' + jobs: + - '{project-name}-{stream}-docker-java-version-shell-daily': + docker-pom: 'pom.xml' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-nfvo-svnfm-driver-docker-image.sh' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml index c295f25fe..23a611774 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-svnfm-zte-java.yaml @@ -15,11 +15,6 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-docker-java-version-shell-daily': - docker-pom: 'pom.xml' - mvn-goals: 'install' - script: - !include-raw-escape: 'build-driver-svnfm-zte-docker-image.sh' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file |