From bea1e3408d880d56cc560a5ae9c584b660a84f38 Mon Sep 17 00:00:00 2001
From: DarraghEgan <darragh.egan@est.tech>
Date: Wed, 29 May 2019 11:35:39 +0000
Subject: [PATCH] INT-1085: Upgrade SDNC image and certs in CSIT

The SDNC image used for testing in CSIT is an
older image version so this needs to be updated
to a newer version which is 1.5.2

Also the certs are outdated as server.crt is no
longer a mandatory file.

Issue-ID: INT-1085
Change-Id: I081a8e79864619d750dbc838750b112a9bbadf53
Signed-off-by: DarraghEgan <darragh.egan@est.tech>
---
 plans/sdnc/healthcheck/setup.sh                     |   2 +-
 .../certs/certs.properties                          |   0
 .../sdnc_netconf_tls_post_deploy/certs/keys0.zip    | Bin 5057 -> 4300 bytes
 plans/sdnc/sdnc_netconf_tls_post_deploy/setup.sh    |  20 +++++++-------------
 4 files changed, 8 insertions(+), 14 deletions(-)
 mode change 100644 => 100755 plans/sdnc/sdnc_netconf_tls_post_deploy/certs/certs.properties
 mode change 100644 => 100755 plans/sdnc/sdnc_netconf_tls_post_deploy/certs/keys0.zip

diff --git a/plans/sdnc/healthcheck/setup.sh b/plans/sdnc/healthcheck/setup.sh
index 7a66351f..83a9dce9 100755
--- a/plans/sdnc/healthcheck/setup.sh
+++ b/plans/sdnc/healthcheck/setup.sh
@@ -24,7 +24,7 @@ export NEXUS_USERNAME=docker
 export NEXUS_PASSWD=docker
 export NEXUS_DOCKER_REPO=nexus3.onap.org:10001
 export DMAAP_TOPIC=AUTO
-export DOCKER_IMAGE_VERSION=1.5-STAGING-latest
+export DOCKER_IMAGE_VERSION=1.5.2
 export CCSDK_DOCKER_IMAGE_VERSION=0.4-STAGING-latest
 
 export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
diff --git a/plans/sdnc/sdnc_netconf_tls_post_deploy/certs/certs.properties b/plans/sdnc/sdnc_netconf_tls_post_deploy/certs/certs.properties
old mode 100644
new mode 100755
diff --git a/plans/sdnc/sdnc_netconf_tls_post_deploy/certs/keys0.zip b/plans/sdnc/sdnc_netconf_tls_post_deploy/certs/keys0.zip
old mode 100644
new mode 100755
index 48b4d90a10272ae8bd87645bf7dc7058fa298327..387d09c6be2d1c3605a9a7fc8b988b93da20c343
GIT binary patch
delta 1479
zcmX@8enycuz?+#xgaHJC6IM>-l`%fYaV6#o5QFH_3T_5QmKV$n3}6DHmV<!<q}C6t
z2}m3gn;gicQ4dmo3%kCzQ#{wN@{nlz{)cOF+^l^}=el>V=ycQ-VHGL&Y2um26ZK$y
z{yEF-`Br!5epy#6J}HDLf3JS%*V?Ji&2?8Tay%~Ad|)^4yPe`L%=+iq-+WRGV`kZR
zcX3j|&S!zPJL<Zck5s!g*EfCLsrJ(O%{BMDMETV>7xb-452@u|_00WPy~$qPS8Q?b
z_is!K_!751F;tynf4$9w6}t=_Qu1GR^)<NKg*LvjnitK{_)LO%owLAeZ3k&3Nv#|H
z*L#=(UE70fU;LAp&Ej;KEhJpiG`r77oVzb`Rm=JhhN|vdzM>vxjt$b=_S8>tGVNRY
zcvG?e^WE8k%}u|G<%;~y+<x_N{|Ubz5f6<;im!^uo<1crd)A!AH;(>2Z!RIRE%oxW
zJqP5DwJ|d;T~VO+F7VO5tm93ZlfwKRc^<Fv*|d7s6D1clOQE0slPB*oTT^?}qsFw7
zEqQXbXF|Z~C&#?STmLP+8@0f?uH)tM8}<LL1hEABn2DssNBe6Ssb164+_1k)IGEA;
zn6b^<nSM*s12i_3tLSb!@a(iefJfNec%7&}Ovk1l(>TL(RBU-yGw0jv1N*WLSeA9P
zyqxz<^p}nOu?O?qS6yPsn*I7n!<PlcvO89rTEG6A$diy35Fqq;`N^rG4_2SPV!Q2(
zymZq2`lK7zkN?Q7ZSWLf*v2t~`-7qWf{MHK0s#*<wr-VOFs&xeCt~ZoCnn#u?9+U<
z2X3%0pPi9$>0#1ay)Cyl1nezy-*(OMMvrye{!=fQ+{=PboXp#M(Qot7C%fD)xg0;O
z9JaM=y4_8_5YII#;^`6h%BGj)9(^n6x#`1=Ws}>V=<I%2uee!&Tcp0;(lTK0<}FS9
zYvvmH7+Ol5&oZ2KO0Vi%?bY2*dD%MrW+%k{EQ)+By`-x;`D*07S9M0t0#h$<E{WLq
z>|K0}YvuvYzNbeLXS?gPu8+wJDvkUtq<?(bgTza0cC$X+%rn#7KJ(zNbrJU#&73(q
zuE&eL{8a8Ao>MvRBVX2kj@fdL*|n^?EBwurQg=m-BXhj6SGAsD3Kdj|Ii|ny@)qaz
z#+Bch9n=`}mMZ+&!9L4U(JSXx<C9rcGv~EN6<5erDm4fvSDfXI?b~_mcl8GGV2<Q<
z1|Kf}$&X`f_TS9fc$QJU;LES-`)}oI)g9zLvvbv^neVf?`YCR2%+ZMp>euTBU%Kme
z_K3MZ_oDK1v*eA+WjiNd-&v|JZ7V->)3&=ieKflYUo5?Bu;$2T$6bE!CU>je@VvWZ
zYjw@MS04+PsQN9uQTi_RX6~NVS@YgJ`^<eRO)xU|)`v@LRZO<aCu)jc+G_Xv_38;c
z{#_9(E-j0#oU!S_hgmKQK0hmY6>jrZtbRr=w?gFh-jxdKJMOocu6o8dtH3B~YVLCm
zPM4b<c2_nnN!D2EeKCCMW|foAb45yARDJ}UE&0Ez-B(c3?qRfQ?0li*$8B$A=S`1@
zXt-Fh?FQRTOXsPZ1Ld_B$Li<y$!JHt;LJAJy=D56kb;YC=bBzFw7s=2=UlI>#K8g;
zoyYGz@9$sX&GX0q*}ld<Y@ei0<SXoN{8P_Z`4P@x`?Q|%$xo;ZNOV8jg!KQ6DG&Jr
zyxBP%`mb9~X91UHXILaAMk%s`3bRy>D;t}dSzzqVJgoYxyo^jD%<v*}vb~TNH&U57
z*+5uE0aQF93}j%CWl(^XmJC}OT^J_k2&;fKK?_WfrpXh8<e1%9873x5!K{M{vrPUZ
XB*k=rb26W>G+b)7umYPkKgd)7hu5BN

delta 2262
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
BN5udD

diff --git a/plans/sdnc/sdnc_netconf_tls_post_deploy/setup.sh b/plans/sdnc/sdnc_netconf_tls_post_deploy/setup.sh
index 92470d29..3b08ef3f 100644
--- a/plans/sdnc/sdnc_netconf_tls_post_deploy/setup.sh
+++ b/plans/sdnc/sdnc_netconf_tls_post_deploy/setup.sh
@@ -19,15 +19,12 @@
 # Place the scripts in run order:
 SCRIPTS="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 source ${WORKSPACE}/scripts/sdnc/script1.sh
-export DOCKER_SDNC_REPO=darby321
-export DOCKER_SDNC_TAG=testimage1
-export DOCKER_USERNAME=darby321
-export DOCKER_PASSWORD=Darragh1993
+export DOCKER_SDNC_TAG=1.5.2
 export NEXUS_USERNAME=docker
 export NEXUS_PASSWD=docker
 export NEXUS_DOCKER_REPO=nexus3.onap.org:10001
 export DMAAP_TOPIC=AUTO
-export DOCKER_IMAGE_VERSION=1.5-STAGING-latest
+export DOCKER_IMAGE_VERSION=1.5.2
 export CCSDK_DOCKER_IMAGE_VERSION=0.4-STAGING-latest
 
 export MTU=$(/sbin/ifconfig | grep MTU | sed 's/.*MTU://' | sed 's/ .*//' | sort -n | head -1)
@@ -42,6 +39,8 @@ cd $WORKSPACE/archives
 git clone -b master --single-branch --depth=1 http://gerrit.onap.org/r/integration.git integration
 cd $WORKSPACE/archives/integration
 git pull
+#cd $WORKSPACE/archives/integration/test/mocks/pnfsimulator
+#sed -i 's/nexus3.onap.org:10003\/onap\/pnf-simulator:4.0.0-SNAPSHOT/nexus3.onap.org:10001\/onap\/pnf-simulator:latest/' docker-compose.yml
 HOST_IP_ADDR=localhost
 # Clone SDNC repo to get docker-compose for SDNC
 mkdir -p $WORKSPACE/archives/sdnc
@@ -52,16 +51,11 @@ git pull
 unset http_proxy https_proxy
 cd $WORKSPACE/archives/sdnc/installation/src/main/yaml
 
-docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD $DOCKER_SDNC_REPO
-docker pull $DOCKER_SDNC_REPO/sdnc-image:$DOCKER_SDNC_TAG
-docker tag $DOCKER_SDNC_REPO/sdnc-image:$DOCKER_SDNC_TAG onap/sdnc-image:latest
-docker logout $DOCKER_SDNC_REPO
-
 sed -i "s/DMAAP_TOPIC_ENV=.*/DMAAP_TOPIC_ENV="AUTO"/g" docker-compose.yml
 docker login -u $NEXUS_USERNAME -p $NEXUS_PASSWD $NEXUS_DOCKER_REPO
 
-#Docker pull $NEXUS_DOCKER_REPO/onap/sdnc-image:$DOCKER_IMAGE_VERSION
-#docker tag $NEXUS_DOCKER_REPO/onap/sdnc-image:$DOCKER_IMAGE_VERSION onap/sdnc-image:latest
+docker pull $NEXUS_DOCKER_REPO/onap/sdnc-image:$DOCKER_SDNC_TAG
+docker tag $NEXUS_DOCKER_REPO/onap/sdnc-image:$DOCKER_SDNC_TAG onap/sdnc-image:latest
 
 docker pull $NEXUS_DOCKER_REPO/onap/sdnc-ansible-server-image:$DOCKER_IMAGE_VERSION
 docker tag $NEXUS_DOCKER_REPO/onap/sdnc-ansible-server-image:$DOCKER_IMAGE_VERSION onap/sdnc-ansible-server-image:latest
@@ -153,4 +147,4 @@ fi
 sleep 200
 
 # Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v SCRIPTS:${SCRIPTS}"
\ No newline at end of file
+ROBOT_VARIABLES="-v SCRIPTS:${SCRIPTS}"
-- 
2.16.6