diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/global-templates-python.yaml | 7 | ||||
| -rw-r--r-- | jjb/global-templates-script.yaml | 4 | ||||
| -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 | ||||
| -rw-r--r-- | jjb/portal/portal-docker.yaml | 2 |
6 files changed, 24 insertions, 10 deletions
diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml index a5c3b9003..d7eeaf21b 100644 --- a/jjb/global-templates-python.yaml +++ b/jjb/global-templates-python.yaml @@ -106,4 +106,9 @@ - docker-login - - shell: !include-raw: include-docker-push.sh + - shell: | + cp $WORKSPACE/docker/* . + docker -D build -t openecomp/testuite . + export DOCKER_REPOSITORY="nexus3.openecomp.org:10003" + docker tag openecomp/testuite:latest $DOCKER_REPOSITORY/openecomp/testuite:latest + docker push $DOCKER_REPOSITORY/openecomp/testuite:latest
\ No newline at end of file diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml index 4adc65e86..d8f7d9972 100644 --- a/jjb/global-templates-script.yaml +++ b/jjb/global-templates-script.yaml @@ -731,7 +731,7 @@ # build-node: what build node to run on # script: build script to execute - name: '{project-name}-{stream}-release-docker-script-daily' + name: '{project-name}-{stream}-release-docker-script-manual' project-type: freestyle concurrent: true @@ -770,8 +770,6 @@ build-timeout: '{build-timeout}' triggers: - # 12 AM UTC - - timed: 'H 12 * * *' - gerrit-trigger-release-manually: server: '{server-name}' project: '{project}' 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: diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml index 85b3536b4..294e88673 100644 --- a/jjb/portal/portal-docker.yaml +++ b/jjb/portal/portal-docker.yaml @@ -10,7 +10,7 @@ - '{project-name}-{stream}-merge-docker-script': script: !include-raw-escape: 'docker-build-push.sh' - - '{project-name}-{stream}-release-docker-script-daily': + - '{project-name}-{stream}-release-docker-script-manual': script: !include-raw-escape: 'docker-build-release.sh' project: 'portal' |