diff options
| author |   Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> | 2021-01-15 17:20:00 +0200 |
|---|---|---|
| committer | Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> | 2021-01-21 13:16:48 +0200 |
| commit | 133593ad30f5eaa8bddca89c191e334b5d7e8bbd (patch) | |
| tree | 7516fca99360c957015486545346ee2742ab0b66 /src | |
| parent | 9a44c20511157eb6bb35254712020c82cf786211 (diff) | |
Adjust CSIT for unified review verification
- enable use of locally built images (without nexus repo prefix)
in docker-compose.yaml
- use local docker images in CSIT by default
- remove forced docker image push of odlsli-alpine and dgbuilder
- remove unique docker tag usage
- this change requires https://gerrit.onap.org/r/c/ci-management/+/116920
to be merged to work correctly
Issue-ID: INT-1823
Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Change-Id: Ibc391ef4fc9412665a26486af6fcc8c26096cc64
Diffstat (limited to 'src')
| -rw-r--r-- | src/main/scripts/TagSnapshotVersion.groovy | 1 | ||||
| -rw-r--r-- | src/main/yaml/docker-compose.yml | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/main/scripts/TagSnapshotVersion.groovy b/src/main/scripts/TagSnapshotVersion.groovy index 410b980f..0c3a55b7 100644 --- a/src/main/scripts/TagSnapshotVersion.groovy +++ b/src/main/scripts/TagSnapshotVersion.groovy @@ -31,7 +31,6 @@ propertiesFile.withInputStream { project.properties['project.docker.latestminortag.snapshot.version']=properties.release_name + '.' + properties.sprint_number + "-SNAPSHOT-latest"; project.properties['project.docker.latestfulltag.snapshot.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-latest"; project.properties['project.docker.latesttagtimestamp.snapshot.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-"+project.properties['ccsdk.build.timestamp']; -project.properties['project.docker.uniquedockertag.snapshot.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-"+project.properties['uniquedockertag']; // Temporary solution for odl-sodium-alpine dependence in odlsli-alpine image build project.properties['project.docker.latestfulltag.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-STAGING-latest"; diff --git a/src/main/yaml/docker-compose.yml b/src/main/yaml/docker-compose.yml index 9ed91c69..4a5e57f9 100644 --- a/src/main/yaml/docker-compose.yml +++ b/src/main/yaml/docker-compose.yml @@ -17,7 +17,7 @@ services: odlsli: - image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-odlsli-alpine-image:${CCSDK_DOCKER_IMAGE_VERSION} + image: ${NEXUS_DOCKER_REPO}onap/ccsdk-odlsli-alpine-image:${CCSDK_DOCKER_IMAGE_VERSION} depends_on : - db container_name: ccsdk_odlsli_container @@ -38,7 +38,7 @@ services: max-file: "5" dgbuilder: - image: ${NEXUS_DOCKER_REPO}/onap/ccsdk-dgbuilder-image:${CCSDK_DOCKER_IMAGE_VERSION} + image: ${NEXUS_DOCKER_REPO}onap/ccsdk-dgbuilder-image:${CCSDK_DOCKER_IMAGE_VERSION} depends_on: - db container_name: ccsdk_dgbuilder_container |