X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=jjb%2Fportal%2Fportal-docker.yaml;h=d275d6536e32e36949c77a4cf67cc62517e96174;hb=250a5263c0dcfdb01016b1eae008fe73c93f7f19;hp=294e886738cc1063087ebd96c5ff654ea9bc21f9;hpb=4a7bda71a2cbc6dc18c26149c2666cd6b9dc0df1;p=ci-management.git diff --git a/jjb/portal/portal-docker.yaml b/jjb/portal/portal-docker.yaml index 294e88673..d275d6536 100644 --- 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'