Allow only released docker images in the manifest

Change-Id: I8ebc0e6a8b923a4b9c81403ade7248a4396b179e
Issue-ID: INT-504
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/version-manifest/pom.xml b/version-manifest/pom.xml
index daa957e..89fb1b1 100644 (file)
--- a/version-manifest/pom.xml
+++ b/version-manifest/pom.xml
@@ -122,7 +122,7 @@
             </configuration>
           </execution>
           <execution>
-            <id>check-docker-images-exist</id>
+            <id>check-docker-images-released</id>
             <phase>validate</phase>
             <goals>
               <goal>exec</goal>

diff --git a/version-manifest/src/main/resources/docker-manifest-staging.csv b/version-manifest/src/main/resources/docker-manifest-staging.csv
new file mode 100644 (file)
index 0000000..dc612f5
--- /dev/null
+++ b/version-manifest/src/main/resources/docker-manifest-staging.csv
@@ -0,0 +1,112 @@
+image,tag
+onap/aaf/aaf_cm,2.1.1
+onap/aaf/aaf_fs,2.1.1
+onap/aaf/aaf_gui,2.1.1
+onap/aaf/aaf_hello,2.1.1
+onap/aaf/aaf_locate,2.1.1
+onap/aaf/aaf_oauth,2.1.1
+onap/aaf/aaf_service,2.1.1
+onap/aaf/sms,2.0.0
+onap/aaf/smsquorumclient,2.0.0
+onap/aai-resources,1.2.2
+onap/aai-traversal,1.2.2
+onap/aai/esr-gui,1.1.0
+onap/aai/esr-server,1.1.0
+onap/admportal-sdnc-image,1.3.4
+onap/appc-cdt-image,1.3.0
+onap/appc-image,1.3.0
+onap/babel,1.2.0
+onap/ccsdk-dgbuilder-image,0.2.4
+onap/ccsdk-odl-image,0.2.4
+onap/ccsdk-odlsli-image,0.2.4
+onap/champ,1.2.3
+onap/clamp,2.0.2
+onap/cli,2.0.2
+onap/data-router,1.2.2
+onap/dmaap/buscontroller,1.0.12
+onap/dmaap/dmaap-mr,1.1.4
+onap/externalapi/nbi,2.0.0
+onap/gizmo,1.2.1
+onap/holmes/engine-management,1.1.0
+onap/holmes/rule-management,1.1.0
+onap/model-loader,1.2.1
+onap/msb/msb_apigateway,1.1.0
+onap/msb/msb_discovery,1.1.0
+onap/multicloud/framework,1.1.2
+onap/multicloud/openstack-newton,1.1.2
+onap/multicloud/openstack-ocata,1.1.2
+onap/multicloud/openstack-windriver,1.1.2
+onap/multicloud/vio,1.1.2
+onap/multicloud/vio-vesagent,1.0.0
+onap/music/cassandra_music,3.0.0
+onap/music/music,2.5.3
+onap/oom/kube2msb,1.1.0
+onap/optf-has,1.1.1
+onap/optf-osdf,1.1.1
+onap/org.onap.dcaegen2.collectors.snmptrap,1.3.0
+onap/org.onap.dcaegen2.collectors.ves.vescollector,1.2.0
+onap/org.onap.dcaegen2.deployments.bootstrap,1.1.3
+onap/org.onap.dcaegen2.deployments.cm-container,1.3.0
+onap/org.onap.dcaegen2.deployments.healthcheck-container,1.1.0
+onap/org.onap.dcaegen2.deployments.k8s-bootstrap-container,1.1.11
+onap/org.onap.dcaegen2.deployments.redis-cluster-container,1.0.0
+onap/org.onap.dcaegen2.deployments.tca-cdap-container,1.1.0
+onap/org.onap.dcaegen2.platform.cdapbroker,4.1.0
+onap/org.onap.dcaegen2.platform.configbinding,2.1.5
+onap/org.onap.dcaegen2.platform.deployment-handler,2.1.5
+onap/org.onap.dcaegen2.platform.inventory-api,3.0.1
+onap/org.onap.dcaegen2.platform.policy-handler,2.4.5
+onap/org.onap.dcaegen2.platform.servicechange-handler,1.1.4
+onap/policy-drools,1.2.3
+onap/policy-pe,1.2.3
+onap/portal-app,2.2.0
+onap/portal-db,2.2.0
+onap/portal-sdk,2.2.0
+onap/portal-wms,2.2.0
+onap/sdc-api-tests,1.3-STAGING-latest
+onap/sdc-backend,1.3-STAGING-latest
+onap/sdc-backend-init,1.3-STAGING-latest
+onap/sdc-cassandra,1.3-STAGING-latest
+onap/sdc-cassandra-init,1.3-STAGING-latest
+onap/sdc-elasticsearch,1.3-STAGING-latest
+onap/sdc-frontend,1.3-STAGING-latest
+onap/sdc-init-elasticsearch,1.3-STAGING-latest
+onap/sdc-kibana,1.3-STAGING-latest
+onap/sdc-onboard-backend,1.3-STAGING-latest
+onap/sdc-onboard-cassandra-init,1.3-STAGING-latest
+onap/sdc-simulator,1.3-STAGING-latest
+onap/sdc-ui-tests,1.3-STAGING-latest
+onap/sdc/sdc-workflow-designer,1.1.0
+onap/sdnc-ansible-server-image,1.3.4
+onap/sdnc-dmaap-listener-image,1.3.4
+onap/sdnc-image,1.3.4
+onap/sdnc-ueb-listener-image,1.3.4
+onap/search-data-service,1.2.1
+onap/sniroemulator,1.0.0
+onap/sparky-be,1.2.1
+onap/testsuite,1.2.1
+onap/usecase-ui,1.1.1
+onap/usecase-ui/usecase-ui-server,1.1.1
+onap/vfc/catalog,1.1.0
+onap/vfc/emsdriver,1.1.0
+onap/vfc/gvnfmdriver,1.1.0
+onap/vfc/jujudriver,1.1.0
+onap/vfc/multivimproxy,1.0.0
+onap/vfc/nfvo/svnfm/huawei,1.1.0
+onap/vfc/nfvo/svnfm/nokia,1.1.0
+onap/vfc/nfvo/svnfm/nokiav2,1.1.0
+onap/vfc/nslcm,1.1.0
+onap/vfc/resmanagement,1.1.0
+onap/vfc/vnflcm,1.1.0
+onap/vfc/vnfmgr,1.1.0
+onap/vfc/vnfres,1.1.0
+onap/vfc/wfengine-activiti,1.1.0
+onap/vfc/wfengine-mgrservice,1.1.0
+onap/vfc/ztesdncdriver,1.1.0
+onap/vfc/ztevnfmdriver,1.1.0
+onap/vid,2.0.0
+onap/vnfsdk/ice,1.1.0
+onap/vnfsdk/refrepo,1.1.1
+onap/vnfsdk/refrepo/postgres,1.1.1
+onap/vnfsdk/vnftest,1.1.0
+openecomp/mso,1.2.2

diff --git a/version-manifest/src/main/resources/docker-manifest.csv b/version-manifest/src/main/resources/docker-manifest.csv
index dc612f5..da87af4 100644 (file)
--- a/version-manifest/src/main/resources/docker-manifest.csv
+++ b/version-manifest/src/main/resources/docker-manifest.csv
@@ -63,19 +63,19 @@ onap/portal-app,2.2.0
 onap/portal-db,2.2.0
 onap/portal-sdk,2.2.0
 onap/portal-wms,2.2.0
-onap/sdc-api-tests,1.3-STAGING-latest
-onap/sdc-backend,1.3-STAGING-latest
-onap/sdc-backend-init,1.3-STAGING-latest
-onap/sdc-cassandra,1.3-STAGING-latest
-onap/sdc-cassandra-init,1.3-STAGING-latest
-onap/sdc-elasticsearch,1.3-STAGING-latest
-onap/sdc-frontend,1.3-STAGING-latest
-onap/sdc-init-elasticsearch,1.3-STAGING-latest
-onap/sdc-kibana,1.3-STAGING-latest
-onap/sdc-onboard-backend,1.3-STAGING-latest
-onap/sdc-onboard-cassandra-init,1.3-STAGING-latest
-onap/sdc-simulator,1.3-STAGING-latest
-onap/sdc-ui-tests,1.3-STAGING-latest
+onap/sdc-api-tests,1.2.0
+onap/sdc-backend,1.2.0
+onap/sdc-backend-init,1.2.0
+onap/sdc-cassandra,1.2.0
+onap/sdc-cassandra-init,1.2.0
+onap/sdc-elasticsearch,1.2.0
+onap/sdc-frontend,1.2.0
+onap/sdc-init-elasticsearch,1.2.0
+onap/sdc-kibana,1.2.0
+onap/sdc-onboard-backend,1.2.0
+onap/sdc-onboard-cassandra-init,1.2.0
+onap/sdc-simulator,1.2.0
+onap/sdc-ui-tests,1.2.0
 onap/sdc/sdc-workflow-designer,1.1.0
 onap/sdnc-ansible-server-image,1.3.4
 onap/sdnc-dmaap-listener-image,1.3.4

diff --git a/version-manifest/src/main/scripts/check-docker-manifest.sh b/version-manifest/src/main/scripts/check-docker-manifest.sh
index 26e63b8..6aa2374 100755 (executable)
--- a/version-manifest/src/main/scripts/check-docker-manifest.sh
+++ b/version-manifest/src/main/scripts/check-docker-manifest.sh
@@ -18,20 +18,12 @@ for line in $(tail -n +2 $1); do
     image=$(echo $line | cut -d , -f 1)
     tag=$(echo $line | cut -d , -f 2)
 
-    tags=$(curl -s $NEXUS_PUBLIC_PREFIX/$image/tags/list | jq -r '.tags[]' 2> /dev/null)
+    tags=$(curl -s $NEXUS_RELEASE_PREFIX/$image/tags/list | jq -r '.tags[]' 2> /dev/null)
     echo "$tags" | grep -q "^$tag\$"
     if [ $? -ne 0 ]; then
-        echo "[ERROR] $image:$tag not found"
+        echo "[ERROR] $image:$tag not released"
         #echo "$tags" | sed 's/^/  /'
         (( err++ ))
-
-    else
-        tags=$(curl -s $NEXUS_RELEASE_PREFIX/$image/tags/list | jq -r '.tags[]' 2> /dev/null)
-        echo "$tags" | grep -q "^$tag\$"
-        if [ $? -ne 0 ]; then
-            echo "[WARN] $image:$tag not released"
-            #echo "$tags" | sed 's/^/  /'
-        fi
     fi
 done
 exit $err