diff options
| author |   Pamela Dragosh <pdragosh@research.att.com> | 2017-02-23 10:36:28 -0500 |
|---|---|---|
| committer | Pamela Dragosh <pdragosh@research.att.com> | 2017-02-23 10:36:34 -0500 |
| commit | 02318fd5ac08111d489b8a438eb00dcdf530120b (patch) | |
| tree | d9383a6c510e2d34961c2eb1efc9994c549e0256 /jjb/policy | |
| parent | ad387ff1c81c07f5f95e42a8accfdc49e075d721 (diff) | |
clean up and use new script for merge
Change-Id: I3c3864480010ee97197fe7649cec620df891d220
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
Diffstat (limited to 'jjb/policy')
| -rw-r--r-- | jjb/policy/include-raw-docker-merge.sh | 10 | ||||
| -rw-r--r-- | jjb/policy/include-raw-docker-release.sh (renamed from jjb/policy/include-raw-docker.sh) | 0 | ||||
| -rw-r--r-- | jjb/policy/policy-docker.yaml | 11 |
3 files changed, 16 insertions, 5 deletions
diff --git a/jjb/policy/include-raw-docker-merge.sh b/jjb/policy/include-raw-docker-merge.sh new file mode 100644 index 000000000..998a93d26 --- /dev/null +++ b/jjb/policy/include-raw-docker-merge.sh @@ -0,0 +1,10 @@ +#!/bin/bash +# +echo '============== CALLING SCRIPT TO VERIFY DOCKER IMAGES =================' + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR + +chmod 755 *.* + +./docker_merge.sh
\ No newline at end of file diff --git a/jjb/policy/include-raw-docker.sh b/jjb/policy/include-raw-docker-release.sh index 00aa7f74c..00aa7f74c 100644 --- a/jjb/policy/include-raw-docker.sh +++ b/jjb/policy/include-raw-docker-release.sh diff --git a/jjb/policy/policy-docker.yaml b/jjb/policy/policy-docker.yaml index 4489304ef..b16b0d03b 100644 --- a/jjb/policy/policy-docker.yaml +++ b/jjb/policy/policy-docker.yaml @@ -3,18 +3,19 @@ name: policy-docker project-name: 'policy-docker-policy' jobs: - - '{project-name}-{stream}-verify-script': + - '{project-name}-{stream}-verify-scm-mvn-script': + mvn-goals: 'clean install prepare-package' script: !include-raw-escape: 'include-raw-docker-verify.sh' - '{project-name}-{stream}-merge-scm-mvn-script': - mvn-goals: '--version' + mvn-goals: 'clean install prepare-package' script: - !include-raw-escape: 'include-raw-docker-verify.sh' + !include-raw-escape: 'include-raw-docker-merge.sh' - '{project-name}-{stream}-docker-java-shell-daily': docker-pom: 'pom.xml' - mvn-goals: 'prepare-package' + mvn-goals: 'clean install prepare-package' script: - !include-raw-escape: 'include-raw-docker.sh' + !include-raw-escape: 'include-raw-docker-release.sh' project: 'policy/docker' stream: |