Merge "Remove beijing jobs for Integration repos"

[ci-management.git] / jjb / portal / portal-docker.yaml

diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml
index 294e886..d275d65 100644 (file)
--- a/jjb/portal/portal-docker.yaml
+++ b/jjb/portal/portal-docker.yaml
@@ -4,28 +4,26 @@
     name: portal-docker
     project-name: 'portal-docker'
     jobs:
-      - '{project-name}-{stream}-three-scm-verify-script':
+      - '{project-name}-{stream}-two-scm-verify-script':
           script:
-              !include-raw-escape: 'docker-build-deploy.sh'
-      - '{project-name}-{stream}-merge-docker-script':
+            !include-raw-escape: 'docker-build-deploy.sh'
+      - '{project-name}-{stream}-two-scm-merge-docker-script':
           script:
-              !include-raw-escape: 'docker-build-push.sh'
-      - '{project-name}-{stream}-release-docker-script-manual':
+            !include-raw-escape: 'docker-build-push.sh'
+      - '{project-name}-{stream}-two-scm-release-docker-script-manual':
           script:
-              !include-raw-escape: 'docker-build-release.sh'
+            !include-raw-escape: 'docker-build-release.sh'
     project: 'portal'
     stream:
       - 'master':
           branch: 'master'
+      - 'release-2.2.0':
+          branch: 'release-2.2.0'
     mvn-settings: 'portal-settings'
     files: '**'
     archive-artifacts: ''
     build-node: ubuntu1604-docker-8c-8g
-    extra-project1: 'ecompsdkos'
-    extra-branch1: 'master'
-    extra-refspec1: 'refs/heads/{branch}'
-    checkout-dir1: 'ecompsdkos'
-    extra-project2: 'ui/dmaapbc'
-    extra-branch2: 'master'
-    extra-refspec2: 'refs/heads/{branch}'
-    checkout-dir2: 'dmaapbc'
+    extra-project: 'portal/sdk'
+    extra-branch: '{branch}'
+    extra-refspec: 'refs/heads/{branch}'
+    checkout-dir: 'sdk'