diff options
| author |   Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> | 2020-12-15 12:00:06 +0200 |
|---|---|---|
| committer | Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> | 2020-12-16 15:59:43 +0200 |
| commit | 110bb110a48b98a40dad33e80071e0a21386f11d (patch) | |
| tree | 0454d4a7fbc89fe3fcd70b1defa75af3bf6b94cc | |
| parent | a79c328f0fdf4ec9b2125a4b3df8192da3247f32 (diff) | |
Separate snapshot tag var names from original
- original tag variables in pom.xmls are being used also outside
of the poms (namely, in Dockerfiles) and the new tag usage is not
taken in use in all images yet, so the tag names are now
differentiated to support old usage where necessary
- add STAGING-latest tag in TagSnapshotVersion groovy script as a
quick fix for odlsli-alpine dependencies for now
- minor typo corrections
Issue-ID: CCSDK-3019
Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Change-Id: Ib6b5e275ea305f5871f124da78a6e94b126c0266
| -rw-r--r-- | dgbuilder-docker/pom.xml | 8 | ||||
| -rw-r--r-- | odlsli/odlsli-alpine/pom.xml | 10 | ||||
| -rw-r--r-- | odlsli/odlsli-alpine/src/main/docker/Dockerfile | 2 | ||||
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | src/main/scripts/TagSnapshotVersion.groovy | 11 |
5 files changed, 18 insertions, 15 deletions
diff --git a/dgbuilder-docker/pom.xml b/dgbuilder-docker/pom.xml index 3bcfff0e..6b88b557 100644 --- a/dgbuilder-docker/pom.xml +++ b/dgbuilder-docker/pom.xml @@ -183,10 +183,10 @@ <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> <dockerFile>Dockerfile</dockerFile> <tags> - <tag>${project.docker.latestminortag.version}</tag> - <tag>${project.docker.latestfulltag.version}</tag> - <tag>${project.docker.latesttagtimestamp.version}</tag> - <tag>${project.docker.uniquedockertag.version}</tag> + <tag>${project.docker.latestminortag.snapshot.version}</tag> + <tag>${project.docker.latestfulltag.snapshot.version}</tag> + <tag>${project.docker.latesttagtimestamp.snapshot.version}</tag> + <tag>${project.docker.uniquedockertag.snapshot.version}</tag> </tags> </build> </image> diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 69a5b920..847a4e69 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -606,10 +606,10 @@ <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> <dockerFile>Dockerfile</dockerFile> <tags> - <tag>${project.docker.latestminortag.version}</tag> - <tag>${project.docker.latestfulltag.version}</tag> - <tag>${project.docker.latesttagtimestamp.version}</tag> - <tag>${project.docker.uniquedockertag.version}</tag> + <tag>${project.docker.latestminortag.snapshot.version}</tag> + <tag>${project.docker.latestfulltag.snapshot.version}</tag> + <tag>${project.docker.latesttagtimestamp.snapshot.version}</tag> + <tag>${project.docker.uniquedockertag.snapshot.version}</tag> </tags> </build> </image> @@ -657,7 +657,7 @@ </run> </image> <image> - <name>${image.name}:${project.docker.latesttagtimestamp.version}</name> + <name>${image.name}:${project.docker.latesttagtimestamp.snapshot.version}</name> <alias>odlsli-container</alias> <run> <env> diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile index e8fa5ef6..adb686ab 100644 --- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile +++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile @@ -17,7 +17,7 @@ COPY org.ops4j.pax.logging.cfg $ODL_HOME/etc/org.ops4j.pax.logging.cfg FROM ${base.image.name}:${project.docker.latestfulltag.version} -LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)" +LABEL maintainer="CCSDK Team (onap-ccsdk@lists.onap.org)" USER root ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties @@ -14,7 +14,7 @@ <packaging>pom</packaging> <name>ccsdk-distribution</name> - <description>Creates distributuon bundles for CCSDK</description> + <description>Creates distribution bundles for CCSDK</description> <modules> <module>platform-logic</module> diff --git a/src/main/scripts/TagSnapshotVersion.groovy b/src/main/scripts/TagSnapshotVersion.groovy index 97014743..410b980f 100644 --- a/src/main/scripts/TagSnapshotVersion.groovy +++ b/src/main/scripts/TagSnapshotVersion.groovy @@ -28,7 +28,10 @@ propertiesFile.withInputStream { properties.load(it) } -project.properties['project.docker.latestminortag.version']=properties.release_name + '.' + properties.sprint_number + "-SNAPSHOT-latest"; -project.properties['project.docker.latestfulltag.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-latest"; -project.properties['project.docker.latesttagtimestamp.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-"+project.properties['ccsdk.build.timestamp']; -project.properties['project.docker.uniquedockertag.version']=properties.release_name + '.' + properties.sprint_number + '.' + properties.feature_revision + "-SNAPSHOT-"+project.properties['uniquedockertag']; +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"; |