diff options
| -rw-r--r-- | jjb/doc/doc-templates-rtd.yaml | 6 | ||||
| -rwxr-xr-x | jjb/vfc/build-gvnfm-driver-docker-image.sh | 11 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml | 6 |
3 files changed, 20 insertions, 3 deletions
diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml index c6bec58ec..884c3706b 100644 --- a/jjb/doc/doc-templates-rtd.yaml +++ b/jjb/doc/doc-templates-rtd.yaml @@ -58,7 +58,11 @@ builders: - shell: | if [ "$GERRIT_PROJECT" != "doc" ]; then - cd docs/submodules/$GERRIT_PROJECT + if [ -d docs/submodules/$GERRIT_PROJECT.git ]; then + cd docs/submodules/$GERRIT_PROJECT.git + else + cd docs/submodules/$GERRIT_PROJECT + fi git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD else git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD diff --git a/jjb/vfc/build-gvnfm-driver-docker-image.sh b/jjb/vfc/build-gvnfm-driver-docker-image.sh new file mode 100755 index 000000000..3560e41df --- /dev/null +++ b/jjb/vfc/build-gvnfm-driver-docker-image.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 ./gvnfmadapter/docker/*.* + +./gvnfmadapter/docker/build_image.sh + diff --git a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml index 0d57efa2d..5dbd4fe8d 100644 --- a/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-vnfm-gvnfm-java.yaml @@ -15,9 +15,11 @@ jobs: - '{project-name}-{stream}-{subproject}-verify-java' - '{project-name}-{stream}-{subproject}-merge-java' - - '{project-name}-{stream}-docker-version-java-daily': + - '{project-name}-{stream}-docker-java-version-shell-daily': docker-pom: 'pom.xml' - mvn-profile: 'docker' + mvn-goals: 'install' + script: + !include-raw-escape: 'build-gvnfm-driver-docker-image.sh' files: '**' archive-artifacts: '' build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file |