diff options
| author |   Jessica Wagantall <jwagantall@linuxfoundation.org> | 2018-05-16 19:37:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-16 19:37:31 +0000 |
| commit | 247026d863219c22dc33d62da875aca1906af65c (patch) | |
| tree | 657cd305e877afa5717666677fe1d96e0f2b9378 /jjb | |
| parent | 325a2753bfa4018f057b7ca1e9c811741cce20f7 (diff) | |
| parent | bb2815b6bbb09bf250c345f184efc7d9f665a4e7 (diff) | |
Merge "Store staging and snapshot artifict in same repo"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/global-templates-docker.yaml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml index 96aed9d50..8145efacd 100644 --- a/jjb/global-templates-docker.yaml +++ b/jjb/global-templates-docker.yaml @@ -112,6 +112,7 @@ DOCKER_NAME={docker_name} DOCKER_ROOT={docker_root} DOCKER_TAG={docker_tag} + BUILD_MODE=SNAPSHOT DOCKERREGISTRY={docker_registry} # Do the docker build - shell: !include-raw: ../shell/docker-build.sh @@ -151,6 +152,7 @@ DOCKER_NAME={docker_name} DOCKER_ROOT={docker_root} DOCKER_TAG={docker_tag} + BUILD_MODE=SNAPSHOT DOCKERREGISTRY={docker_registry} # Do the docker build - shell: !include-raw: ../shell/docker-build.sh @@ -171,7 +173,7 @@ # branch: git branch (eg. stable/lithium or master) <<: *docker_job_boiler_plate - docker_registry: '$DOCKER_REGISTRY:10004' + docker_registry: '$DOCKER_REGISTRY:10003' scm: - lf-infra-gerrit-scm: @@ -196,6 +198,7 @@ DOCKER_ROOT={docker_root} DOCKER_TAG={docker_tag} DOCKERREGISTRY={docker_registry} + BUILD_MODE=STAGING # Do the docker build - shell: !include-raw: ../shell/snapshot-strip.sh @@ -241,6 +244,7 @@ DOCKER_ROOT={docker_root} DOCKER_TAG={docker_tag} DOCKERREGISTRY={docker_registry} + BUILD_MODE=SNAPSHOT # Do the docker build - shell: !include-raw: ../shell/docker-build.sh - inject: @@ -280,6 +284,7 @@ DOCKER_ROOT={docker_root} DOCKER_TAG={docker_tag} DOCKERREGISTRY={docker_registry} + BUILD_MODE=SNAPSHOT # Do the docker build - shell: !include-raw: ../shell/docker-build.sh - inject: @@ -299,7 +304,7 @@ # branch: git branch (eg. stable/lithium or master) <<: *docker_job_boiler_plate - docker_registry: '$DOCKER_REGISTRY:10004' + docker_registry: '$DOCKER_REGISTRY:10003' scm: - lf-infra-gerrit-scm: @@ -324,6 +329,7 @@ DOCKER_ROOT={docker_root} DOCKER_TAG={docker_tag} DOCKERREGISTRY={docker_registry} + BUILD_MODE=STAGING # Do the docker build - shell: !include-raw: ../shell/snapshot-strip.sh |