diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/global-templates-python.yaml | 65 | ||||
| -rw-r--r-- | jjb/testsuite/testsuite-docker.sh | 6 |
2 files changed, 3 insertions, 68 deletions
diff --git a/jjb/global-templates-python.yaml b/jjb/global-templates-python.yaml index acd5e17f0..966ecb324 100644 --- a/jjb/global-templates-python.yaml +++ b/jjb/global-templates-python.yaml @@ -71,71 +71,6 @@ maven-version: '{maven-version}' - job-template: - # Job template for docker daily jobs - # - # The purpose of this job template is to run: - # 1. login into the docker registry - # 2. docker build - # 3. docker tag - # 4. docker push - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - - name: '{project-name}-{stream}-docker-shell-daily' - project-type: freestyle - node: 'ubuntu1604-docker-8c-8g' - - properties: - - infra-properties: - build-days-to-keep: '{build-days-to-keep}' - - parameters: - - infra-parameters: - project: '{project}' - branch: '{branch}' - refspec: 'refs/heads/{branch}' - artifacts: '{archive-artifacts}' - - maven-exec: - maven-version: '{maven-version}' - - scm: - - gerrit-trigger-scm: - refspec: '' - choosing-strategy: 'default' - submodule-recursive: '{submodule-recursive}' - - wrappers: - - infra-wrappers: - build-timeout: '{build-timeout}' - - triggers: - # 12 AM UTC - - timed: 'H 12 * * *' - - gerrit-trigger-release-manually: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - - builders: - - provide-maven-settings: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - - docker-login - - - shell: | - cp $WORKSPACE/docker/* . - docker -D build -t openecomp/testsuite . - export REPO="nexus3.onap.org:10003" - docker tag openecomp/testsuite:latest $REPO/openecomp/testsuite:1.0-STAGING-latest - docker push $REPO/openecomp/testsuite:1.0-STAGING-latest - - publishers: - - infra-shiplogs: - maven-version: '{maven-version}' - -- job-template: # Job template for docker daily jobs for 2 SCMs # # The purpose of this job template is to run: diff --git a/jjb/testsuite/testsuite-docker.sh b/jjb/testsuite/testsuite-docker.sh index 33eea4f81..d29d43c97 100644 --- a/jjb/testsuite/testsuite-docker.sh +++ b/jjb/testsuite/testsuite-docker.sh @@ -2,10 +2,10 @@ # echo '============== CALLING SCRIPT TO CREATE DOCKER IMAGES =================' cp $WORKSPACE/docker/* . -docker -D build -t openecomp/testsuite . +docker -D build -t onap/testsuite . export REPO="nexus3.onap.org:10003" for tag in $tags do - docker tag openecomp/testsuite:latest $REPO/openecomp/testsuite:$tag - docker push $REPO/openecomp/testsuite:$tag + docker tag onap/testsuite:latest $REPO/onap/testsuite:$tag + docker push $REPO/onap/testsuite:$tag done |