summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPamela Dragosh <pdragosh@research.att.com>2020-03-20 13:55:59 +0000
committerPamela Dragosh <pdragosh@research.att.com>2020-03-20 11:43:07 -0400
commitb02fae805ebacd642ca4bc786359a8e2f9d3d201 (patch)
treed93d0ca468ce514c3d89c52d95eedadcb0a8027a
parent35c6651657d71da60bf21df57d07ba4fa612c5e9 (diff)
Revert "Add docker manifest file to build onap/policy-pap"
This reverts commit fcec4180525b4b97d4739c7fa7915f7be0a9709b. Reason for revert: This work is not mature enough for release. Issue-ID: POLICY-1997 Change-Id: I6afd45958c45d657c30f2c0467c55f7f10b5024e Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>
-rwxr-xr-xdocker_push_manifest.sh59
-rw-r--r--packages/policy-pap-docker/pom.xml45
2 files changed, 19 insertions, 85 deletions
diff --git a/docker_push_manifest.sh b/docker_push_manifest.sh
deleted file mode 100755
index e41069cc..00000000
--- a/docker_push_manifest.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/bash -ex
-# ============LICENSE_START=======================================================
-# Copyright (C) 2019 ENEA AB. All rights reserved.
-# Modifications Copyright (C) 2020 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# SPDX-License-Identifier: Apache-2.0
-# ============LICENSE_END=========================================================
-
-# This script creates the multi-arch manifest for the docker images
-
-source version.properties
-IMAGES="onap/policy-pap"
-ARCHES="amd64 arm64"
-TIMESTAMP=$(date -u +"%Y%m%d%H%M%S")
-MT_RELEASE='v0.9.0'
-
-# Download the manifest tool based on the host's architecture
-HOST_ARCH='amd64'
-if [ "$(uname -m)" == 'aarch64' ]; then
- HOST_ARCH='arm64'
-fi
-wget https://github.com/estesp/manifest-tool/releases/download/${MT_RELEASE}/manifest-tool-linux-${HOST_ARCH} -O ./manifest-tool
-chmod u+x manifest-tool
-
-# Tag the images and push the manifest (do not fail if some prerequisite tags are not yet present)
-set +e
-for image in ${IMAGES}; do
- # always (re)create both SNAPSHOT and STAGING tags to make sure everything is up to date
- TAGS="latest ${release_version}-SNAPSHOT ${release_version}-SNAPSHOT-latest ${release_version}-STAGING-latest"
- for tag in ${TAGS}; do
- ./manifest-tool push from-args \
- --ignore-missing \
- --platforms "linux/${ARCHES// /,linux/}" \
- --template "${image}:${tag}-ARCH" \
- --target "${image}:${tag}"
- done
-
- # Create timestamped multiarch tag; if the script is ran from the merge
- # job then add the SNAPSHOT suffix
- [[ "${PARENT_JOB_NAME}" =~ merge ]] && snapshot_suffix="SNAPSHOT-"
-
- ./manifest-tool push from-args \
- --ignore-missing \
- --platforms "linux/${ARCHES// /,linux/}" \
- --template "${image}:${release_version}-${snapshot_suffix:-}ARCH" \
- --target "${image}:${release_version}-${snapshot_suffix:-}${TIMESTAMP}"
-done
diff --git a/packages/policy-pap-docker/pom.xml b/packages/policy-pap-docker/pom.xml
index 2872cbe2..0615cf2b 100644
--- a/packages/policy-pap-docker/pom.xml
+++ b/packages/policy-pap-docker/pom.xml
@@ -41,8 +41,8 @@
<docker.skip>false</docker.skip>
<docker.skip.build>false</docker.skip.build>
<docker.skip.push>false</docker.skip.push>
- <docker.pull.registry>docker.io</docker.pull.registry>
- <docker.push.registry>docker.io</docker.push.registry>
+ <docker.pull.registry>nexus3.onap.org:10001</docker.pull.registry>
+ <docker.push.registry>nexus3.onap.org:10003</docker.push.registry>
<maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
</properties>
@@ -55,33 +55,25 @@
<version>1.0</version>
<executions>
<execution>
- <phase>pre-clean</phase>
+ <phase>validate</phase>
<goals>
<goal>execute</goal>
</goals>
<configuration>
<source>
- println 'Project version: ' + project.properties['dist.project.version'];
- def versionArray;
- if ( project.properties['dist.project.version'] != null ) {
- versionArray = project.properties['dist.project.version'].split('-');
- }
-
- if ( project.properties['dist.project.version'].endsWith("-SNAPSHOT") ) {
- project.properties['project.docker.latesttag.version']=versionArray[0] + "-SNAPSHOT-latest";
- } else {
- project.properties['project.docker.latesttag.version']=versionArray[0] + "-STAGING-latest";
- }
-
- println 'New tag for docker: ' + project.properties['project.docker.latesttag.version'];
-
- println 'The arch is: ' + System.properties['os.arch'];
- if ( "aarch64".equals(System.properties['os.arch']) ) {
- project.properties['project.docker.arch'] = "arm64";
- } else {
- project.properties['project.docker.arch'] = System.properties['os.arch'];
+ println 'Project version: ' + project.properties['dist.project.version']
+ if (project.properties['dist.project.version'] != null) {
+ def versionArray = project.properties['dist.project.version'].split('-')
+ def minMaxVersionArray = versionArray[0].tokenize('.')
+ if (project.properties['dist.project.version'].endsWith("-SNAPSHOT")) {
+ project.properties['project.docker.latest.minmax.tag.version'] =
+ minMaxVersionArray[0] + "." + minMaxVersionArray[1] + "-SNAPSHOT-latest"
+ } else {
+ project.properties['project.docker.latest.minmax.tag.version'] =
+ minMaxVersionArray[0] + "." + minMaxVersionArray[1] + "-STAGING-latest"
+ }
+ println 'New tag for docker: ' + project.properties['project.docker.latest.minmax.tag.version']
}
- println 'Using arch for docker: ' + project.properties['project.docker.arch'];
</source>
</configuration>
</execution>
@@ -100,13 +92,14 @@
<images>
<image>
- <name>onap/policy-pap:latest-${project.docker.arch}</name>
+ <name>onap/policy-pap</name>
<build>
<cleanup>try</cleanup>
<dockerFile>Dockerfile</dockerFile>
<tags>
- <tag>${project.version}-${project.docker.arch}</tag>
- <tag>${project.docker.latesttag.version}-${project.docker.arch}</tag>
+ <tag>${project.version}</tag>
+ <tag>${project.version}-${maven.build.timestamp}</tag>
+ <tag>${project.docker.latest.minmax.tag.version}</tag>
</tags>
<assembly>
<inline>