diff options
| author |   Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> | 2020-12-03 17:54:13 +0200 |
|---|---|---|
| committer | Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com> | 2020-12-09 16:07:05 +0200 |
| commit | 0c4500afd225801c940b309a2615b1afe3c505c8 (patch) | |
| tree | ba3bc86b85466068ce2572bd256261b582126c0b /odlsli | |
| parent | 161e9a0c026d5a7fee595ef870e662ae9123f4f0 (diff) | |
Move CSIT to ccsdk/distribution repo
- move CCSDK healthcheck CSIT under distribution repository
- add run-project-csit.sh that takes common CSIT scripts from
integration/csit on runtime and then executes all the plans
under distribution/csit/plans
- use version.properties and UNIQUE_DOCKER_TAG to identify the
docker image versions to run for testing if the latter is given,
otherwise just choose "latest" (to enable easy local testing)
- introduce new groovy script for tagging SNAPSHOT images only
based on version.properties and UNIQUE_DOCKER_TAG
- apply UNIQUE_DOCKER_TAG in dgbuilder and odlsli-alpine docker
image versioning
- add script for tagging snapshot images identified with
UNIQUE_DOCKER_TAG with STAGING
- use docker-compose for teardown instead of common kill scripts
Issue-ID: CCSDK-3017
Signed-off-by: Lasse Kaihlavirta <l.kaihlavirt@partner.samsung.com>
Change-Id: I37dcf682bf1ab77016a76adc89f5658bb0b71b19
Diffstat (limited to 'odlsli')
| -rw-r--r-- | odlsli/odlsli-alpine/pom.xml | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index d723fbe8..6f731f81 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -24,7 +24,8 @@ <base.image.name>onap/ccsdk-odl-sodium-alpine-image</base.image.name> <image.name>onap/ccsdk-odlsli-alpine-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> + <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> + <uniquedockertag>${env.UNIQUE_DOCKER_TAG}</uniquedockertag> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <opendaylight.root>opt/opendaylight</opendaylight.root> @@ -45,7 +46,7 @@ <ccsdk.sli.plugins.version>1.1.0</ccsdk.sli.plugins.version> <ccsdk.oran.a1adapter.version>1.1.0</ccsdk.oran.a1adapter.version> <docker.autoCreateCustomNetworks>true</docker.autoCreateCustomNetworks> - </properties> +</properties> <dependencies> <dependency> @@ -333,7 +334,7 @@ <goal>execute</goal> </goals> <configuration> - <source>${basedir}/../../src/main/scripts/TagVersion.groovy</source> + <source>${basedir}/../../src/main/scripts/TagSnapshotVersion.groovy</source> </configuration> </execution> </executions> @@ -608,7 +609,8 @@ <tag>${project.docker.latestminortag.version}</tag> <tag>${project.docker.latestfulltag.version}</tag> <tag>${project.docker.latesttagtimestamp.version}</tag> - </tags> + <tag>${project.docker.uniquedockertag.version}</tag> + </tags> </build> </image> </images> |