diff options
| author |   talasila <talasila@research.att.com> | 2017-02-19 16:53:26 -0500 |
|---|---|---|
| committer | talasila <talasila@research.att.com> | 2017-02-19 17:21:21 -0500 |
| commit | bbf73015e5e7eb2ff45a6370216ebf09f1d45db3 (patch) | |
| tree | 153609afc075d25fef1bdeb4e317b59b18b285f3 /jjb | |
| parent | 811a573cf02ee2777373e451c1356e9aac988055 (diff) | |
portal's merge docker push job added
Change-Id: I960faa37090e981cf473fd7f6582efe9b540fec7
Signed-off-by: talasila <talasila@research.att.com>
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/global-templates-script.yaml | 3 | ||||
| -rw-r--r-- | jjb/portal/docker-build-push.sh | 8 | ||||
| -rw-r--r-- | jjb/portal/portal-docker.yaml | 9 |
3 files changed, 14 insertions, 6 deletions
diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml index addfde830..45592ead8 100644 --- a/jjb/global-templates-script.yaml +++ b/jjb/global-templates-script.yaml @@ -663,9 +663,6 @@ build-timeout: '{build-timeout}' triggers: - - reverse: - jobs: '{dependencies}' - result: 'success' - gerrit-trigger-patch-merged: server: '{server-name}' project: '{project}' diff --git a/jjb/portal/docker-build-push.sh b/jjb/portal/docker-build-push.sh new file mode 100644 index 000000000..ca2c8760b --- /dev/null +++ b/jjb/portal/docker-build-push.sh @@ -0,0 +1,8 @@ + +CURRENTDIR="$(pwd)" +echo $CURRENTDIR +ls -ltr +cd deliveries +ls -ltr +chmod 755 *.* +./os_docker_push.sh
\ No newline at end of file diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml index 8f9c447c5..33e850c2b 100644 --- a/jjb/portal/portal-docker.yaml +++ b/jjb/portal/portal-docker.yaml @@ -4,7 +4,12 @@ name: portal-docker project-name: 'portal-docker' jobs: - - '{project-name}-{stream}-three-scm-verify-script' + - '{project-name}-{stream}-three-scm-verify-script': + script: + !include-raw-escape: 'docker-build-deploy.sh' + - '{project-name}-{stream}-merge-docker-script': + script: + !include-raw-escape: 'docker-build-push.sh' project: 'portal' stream: @@ -22,5 +27,3 @@ extra-branch2: 'master' extra-refspec2: 'refs/heads/{branch}' checkout-dir2: 'dmaapbc' - script: - !include-raw-escape: 'docker-build-deploy.sh' |