From: liboNet Date: Thu, 23 May 2019 19:19:25 +0000 (+0800) Subject: Upgrade to 1.3.3 X-Git-Tag: 1.3.3^0 X-Git-Url: https://gerrit.onap.org/r/gitweb?p=multicloud%2Fframework.git;a=commitdiff_plain;h=9bd32245361a16cc643219909df35b21949798c3 Upgrade to 1.3.3 This is to workaround that 1.3.2 releasing failure Change-Id: I70804a0bb2e5fa358fcf4a33cab937a718d84b34 Issue-ID: MULTICLOUD-648 Signed-off-by: liboNet --- diff --git a/artifactbroker/docker/Dockerfile b/artifactbroker/docker/Dockerfile index a9f0e8d..daa8e24 100644 --- a/artifactbroker/docker/Dockerfile +++ b/artifactbroker/docker/Dockerfile @@ -25,9 +25,9 @@ RUN mkdir -p ${ARTIFACT_DISTRIBUTION_HOME} ${ARTIFACT_LOGS} ${ARTIFACT_HOME}/etc chown -R onap:onap ${ARTIFACT_HOME} ${ARTIFACT_DISTRIBUTION_HOME} ${ARTIFACT_LOGS} WORKDIR ${ARTIFACT_DISTRIBUTION_HOME} -RUN wget -O multicloud-framework-artifactbroker-package-1.3.2-SNAPSHOT.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.framework&a=multicloud-framework-artifactbroker-package&e=zip&v=1.3.2-SNAPSHOT" && \ - unzip -q -o -B multicloud-framework-artifactbroker-package-1.3.2-SNAPSHOT.zip && \ - rm -f multicloud-framework-artifactbroker-package-1.3.2-SNAPSHOT.zip +RUN wget -O multicloud-framework-artifactbroker-package-1.3.3-SNAPSHOT.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.framework&a=multicloud-framework-artifactbroker-package&e=zip&v=1.3.3-SNAPSHOT" && \ + unzip -q -o -B multicloud-framework-artifactbroker-package-1.3.3-SNAPSHOT.zip && \ + rm -f multicloud-framework-artifactbroker-package-1.3.3-SNAPSHOT.zip COPY artifact-dist.sh bin/. #RUN tar xvfz /packages/policy-distribution.tar.gz --directory ${ARTIFACT_DISTRIBUTION_HOME} #RUN rm /packages/policy-distribution.tar.gz diff --git a/artifactbroker/docker/build_image.sh b/artifactbroker/docker/build_image.sh index 55cf93b..696df0e 100755 --- a/artifactbroker/docker/build_image.sh +++ b/artifactbroker/docker/build_image.sh @@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.3.2-SNAPSHOT" -STAGING_VERSION="1.3.2-STAGING" +VERSION="1.3.3-SNAPSHOT" +STAGING_VERSION="1.3.3-STAGING" PROJECT="multicloud" IMAGE="framework-artifactbroker" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/artifactbroker/forwarding/pom.xml b/artifactbroker/forwarding/pom.xml index 21506cd..da1aba4 100644 --- a/artifactbroker/forwarding/pom.xml +++ b/artifactbroker/forwarding/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT multicloud-framework-artifactbroker-forwarding diff --git a/artifactbroker/main/pom.xml b/artifactbroker/main/pom.xml index 0c82f8a..4574372 100644 --- a/artifactbroker/main/pom.xml +++ b/artifactbroker/main/pom.xml @@ -21,7 +21,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT 4.0.0 multicloud-framework-artifactbroker-main diff --git a/artifactbroker/model/pom.xml b/artifactbroker/model/pom.xml index f2324e0..28df7b1 100644 --- a/artifactbroker/model/pom.xml +++ b/artifactbroker/model/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT multicloud-framework-artifactbroker-model diff --git a/artifactbroker/packages/pom.xml b/artifactbroker/packages/pom.xml index a5841b0..e2d26db 100644 --- a/artifactbroker/packages/pom.xml +++ b/artifactbroker/packages/pom.xml @@ -24,7 +24,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT multicloud-framework-artifactbroker-package diff --git a/artifactbroker/plugins/forwarding-plugins/pom.xml b/artifactbroker/plugins/forwarding-plugins/pom.xml index 9c4c042..b30b44a 100644 --- a/artifactbroker/plugins/forwarding-plugins/pom.xml +++ b/artifactbroker/plugins/forwarding-plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker-plugins - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT multicloud-framework-artifactbroker-forwarding-plugins diff --git a/artifactbroker/plugins/pom.xml b/artifactbroker/plugins/pom.xml index 0776eee..65ec73c 100644 --- a/artifactbroker/plugins/pom.xml +++ b/artifactbroker/plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT multicloud-framework-artifactbroker-plugins diff --git a/artifactbroker/plugins/reception-plugins/pom.xml b/artifactbroker/plugins/reception-plugins/pom.xml index 41419e2..222ab54 100644 --- a/artifactbroker/plugins/reception-plugins/pom.xml +++ b/artifactbroker/plugins/reception-plugins/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker-plugins - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT multicloud-framework-artifactbroker-reception-plugins diff --git a/artifactbroker/pom.xml b/artifactbroker/pom.xml index 04029df..2d79241 100644 --- a/artifactbroker/pom.xml +++ b/artifactbroker/pom.xml @@ -23,7 +23,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT pom multicloud-framework-artifactbroker artifact broker diff --git a/artifactbroker/reception/pom.xml b/artifactbroker/reception/pom.xml index 881c5a2..71af912 100644 --- a/artifactbroker/reception/pom.xml +++ b/artifactbroker/reception/pom.xml @@ -22,7 +22,7 @@ org.onap.multicloud.framework multicloud-framework-artifactbroker - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT multicloud-framework-artifactbroker-reception diff --git a/multivimbroker/docker/Dockerfile b/multivimbroker/docker/Dockerfile index 76b945f..46257ba 100644 --- a/multivimbroker/docker/Dockerfile +++ b/multivimbroker/docker/Dockerfile @@ -16,7 +16,7 @@ RUN addgroup -S onap && adduser -S -G onap onap RUN apk update && \ apk add uwsgi wget unzip gcc make libc-dev libffi-dev openssl-dev && \ cd /opt/ && \ - wget -O multicloud-framework.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.framework&a=multicloud-framework-broker&e=zip&v=1.3.2-SNAPSHOT" && \ + wget -O multicloud-framework.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.framework&a=multicloud-framework-broker&e=zip&v=1.3.3-SNAPSHOT" && \ unzip -q -o -B multicloud-framework.zip && \ rm -f multicloud-framework.zip && \ pip install -r /opt/multivimbroker/requirements.txt && \ diff --git a/multivimbroker/docker/build_image.sh b/multivimbroker/docker/build_image.sh index 9c75d12..2b6f548 100644 --- a/multivimbroker/docker/build_image.sh +++ b/multivimbroker/docker/build_image.sh @@ -17,8 +17,8 @@ cd ${DOCKER_BUILD_DIR} BUILD_ARGS="--no-cache" ORG="onap" -VERSION="1.3.2-SNAPSHOT" -STAGING_VERSION="1.3.2-STAGING" +VERSION="1.3.3-SNAPSHOT" +STAGING_VERSION="1.3.3-STAGING" PROJECT="multicloud" IMAGE="framework" DOCKER_REPOSITORY="nexus3.onap.org:10003" diff --git a/multivimbroker/docker/pecan/Dockerfile b/multivimbroker/docker/pecan/Dockerfile index ff55d18..b358d48 100644 --- a/multivimbroker/docker/pecan/Dockerfile +++ b/multivimbroker/docker/pecan/Dockerfile @@ -16,7 +16,7 @@ RUN groupadd -r onap && useradd -r -g onap onap RUN apt-get update && \ apt-get install -y wget unzip gcc && \ cd /opt/ && \ - wget -O multicloud-framework.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.framework.broker&a=multicloud-framework-broker&e=zip&v=1.3.2-SNAPSHOT" && \ + wget -O multicloud-framework.zip "https://nexus.onap.org/service/local/artifact/maven/redirect?r=snapshots&g=org.onap.multicloud.framework.broker&a=multicloud-framework-broker&e=zip&v=1.3.3-SNAPSHOT" && \ unzip -q -o -B multicloud-framework.zip && \ rm -f multicloud-framework.zip && \ pip install -r /opt/multivimbroker/requirements.txt && \ diff --git a/multivimbroker/pom.xml b/multivimbroker/pom.xml index f91ed65..26bd102 100644 --- a/multivimbroker/pom.xml +++ b/multivimbroker/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework-broker - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT pom multicloud-framework-broker multivim broker diff --git a/pom.xml b/pom.xml index f18fd99..d54ff4c 100644 --- a/pom.xml +++ b/pom.xml @@ -24,7 +24,7 @@ 4.0.0 org.onap.multicloud.framework multicloud-framework - 1.3.2-SNAPSHOT + 1.3.3-SNAPSHOT pom multicloud-framework multicloud broker diff --git a/version.properties b/version.properties index 3e594ed..56d96da 100644 --- a/version.properties +++ b/version.properties @@ -19,7 +19,7 @@ major=1 minor=3 -patch=2 +patch=3 base_version=${major}.${minor}.${patch}