portal's merge docker push job added
Change-Id: I960faa37090e981cf473fd7f6582efe9b540fec7
Signed-off-by: talasila <talasila@research.att.com>
diff --git a/jjb/global-templates-script.yaml b/jjb/global-templates-script.yaml
index addfde8..45592ea 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 0000000..ca2c876
--- /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 8f9c447..33e850c 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'