Fetch and run get-helm script in two steps

Sometimes curl times out but that did not fail the job; now it will.

Signed-off-by: Lott, Christopher (cl778h) <cl778h@att.com>
Change-Id: I64ca83aa7d76a455a141036ab0144a88db8050ce

diff --git a/bin/verify-ric-charts b/bin/verify-ric-charts
index fa4d690..1f2ae49 100755 (executable)
--- a/bin/verify-ric-charts
+++ b/bin/verify-ric-charts
@@ -38,8 +38,8 @@ echo "***************************************"
 for dir in "${CHART_ARRAY[@]}"
 do
   
-    rm -r $dir/charts
-    rm -r $dir/tmpcharts
+    rm -rf $dir/charts
+    rm -rf $dir/tmpcharts
     mkdir -p $dir/charts
     cp $TEMP_DIR/ric-common*.tgz $dir/charts/
 

diff --git a/ci/Dockerfile b/ci/Dockerfile
index bd60013..cd5ad00 100644 (file)
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -18,7 +18,9 @@
 
 FROM ubuntu:18.04
 RUN apt-get update && apt-get -y install curl
-RUN curl -L https://git.io/get_helm.sh | bash
+ARG GH=get_helm.sh
+RUN curl --silent --show-error -L https://git.io/${GH} -o ${GH}
+RUN bash ${GH}
 RUN helm init -c
 ARG TGT=/tmp/it-dep
 COPY . $TGT

diff --git a/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-deployment.yaml b/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-deployment.yaml
index 05040f8..41751f3 100644 (file)
--- a/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-deployment.yaml
+++ b/ric-aux/80-Auxiliary-Functions/helm/ves/templates/ves-deployment.yaml
@@ -1,80 +1,80 @@
-################################################################################\r
-#   Copyright (c) 2019 AT&T Intellectual Property.                             #\r
-#   Copyright (c) 2019 Nokia.                                                  #\r
-#                                                                              #\r
-#   Licensed under the Apache License, Version 2.0 (the "License");            #\r
-#   you may not use this file except in compliance with the License.           #\r
-#   You may obtain a copy of the License at                                    #\r
-#                                                                              #\r
-#       http://www.apache.org/licenses/LICENSE-2.0                             #\r
-#                                                                              #\r
-#   Unless required by applicable law or agreed to in writing, software        #\r
-#   distributed under the License is distributed on an "AS IS" BASIS,          #\r
-#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #\r
-#   See the License for the specific language governing permissions and        #\r
-#   limitations under the License.                                             #\r
-################################################################################\r
-\r
-\r
-\r
-kind: Deployment\r
-apiVersion: extensions/v1beta1\r
-metadata:\r
-  name: {{ include "common.deploymentname.ves" . }}\r
-  generation: 1\r
-  labels:\r
-    app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }}\r
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}\r
-    release: {{ .Release.Name }}\r
-    heritage: {{ .Release.Service }}\r
-  annotations:\r
-    deployment.kubernetes.io/revision: '1'\r
-spec:\r
-  replicas: {{ .Values.ves.replicaCount }}\r
-  selector:\r
-    matchLabels:\r
-      app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }}\r
-      release: {{ .Release.Name }}\r
-  template:\r
-    metadata:\r
-      labels:\r
-        app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }}\r
-        release: {{ .Release.Name }}\r
-    spec:\r
-      hostname: {{ include "common.name.ves" . }}\r
-      volumes:\r
-      - name: component-log\r
-        emptyDir: {}\r
-      - name: dmaap-config-file\r
-        configMap:\r
-          name: {{ include "common.configmapname.ves" . }}\r
-        imagePullPolicy: {{ include "common.pullPolicy" . }}\r
-      imagePullSecrets:\r
-      - name: onap-docker-registry-key\r
-      containers:\r
-      - name: {{ include "common.containername.ves" . }}\r
-        image: {{ .Values.ves.onapRepository }}/{{ .Values.ves.image.name }}:{{ .Values.ves.image.tag }}\r
-        ports:\r
-        - containerPort: {{ include "common.serviceport.ves.http.container" . }}\r
-          protocol: TCP\r
-        - containerPort: {{ include "common.serviceport.ves.https.container" . }}\r
-          protocol: TCP\r
-        volumeMounts:\r
-        - name: component-log\r
-          mountPath: "/opt/app/VESCollector/logs/ecomp"\r
-        - name: dmaap-config-file\r
-          mountPath: "/opt/app/VESCollector/etc/DmaapConfig.json"\r
-          subPath: DMaapConfig.json\r
-        readinessProbe:\r
-          httpGet:\r
-            path: "/healthcheck"\r
-            port: {{ include "common.serviceport.ves.http.container" . }}\r
-            scheme: HTTP\r
-          initialDelaySeconds: 5\r
-          timeoutSeconds: 1\r
-          periodSeconds: 15\r
-          successThreshold: 1\r
-          failureThreshold: 1\r
-        terminationMessagePath: "/dev/termination-log"\r
-        terminationMessagePolicy: File\r
+################################################################################
+#   Copyright (c) 2019 AT&T Intellectual Property.                             #
+#   Copyright (c) 2019 Nokia.                                                  #
+#                                                                              #
+#   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.                                             #
+################################################################################
+
+
+
+kind: Deployment
+apiVersion: extensions/v1beta1
+metadata:
+  name: {{ include "common.deploymentname.ves" . }}
+  generation: 1
+  labels:
+    app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }}
+    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
+    release: {{ .Release.Name }}
+    heritage: {{ .Release.Service }}
+  annotations:
+    deployment.kubernetes.io/revision: '1'
+spec:
+  replicas: {{ .Values.ves.replicaCount }}
+  selector:
+    matchLabels:
+      app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }}
+      release: {{ .Release.Name }}
+  template:
+    metadata:
+      labels:
+        app: {{ include "common.namespace.aux" . }}-{{ include "common.name.ves" . }}
+        release: {{ .Release.Name }}
+    spec:
+      hostname: {{ include "common.name.ves" . }}
+      volumes:
+      - name: component-log
+        emptyDir: {}
+      - name: dmaap-config-file
+        configMap:
+          name: {{ include "common.configmapname.ves" . }}
+      imagePullSecrets:
+      - name: onap-docker-registry-key
+      containers:
+      - name: {{ include "common.containername.ves" . }}
+        image: {{ .Values.ves.onapRepository }}/{{ .Values.ves.image.name }}:{{ .Values.ves.image.tag }}
+        imagePullPolicy: {{ include "common.pullPolicy" . }}
+        ports:
+        - containerPort: {{ include "common.serviceport.ves.http.container" . }}
+          protocol: TCP
+        - containerPort: {{ include "common.serviceport.ves.https.container" . }}
+          protocol: TCP
+        volumeMounts:
+        - name: component-log
+          mountPath: "/opt/app/VESCollector/logs/ecomp"
+        - name: dmaap-config-file
+          mountPath: "/opt/app/VESCollector/etc/DmaapConfig.json"
+          subPath: DMaapConfig.json
+        readinessProbe:
+          httpGet:
+            path: "/healthcheck"
+            port: {{ include "common.serviceport.ves.http.container" . }}
+            scheme: HTTP
+          initialDelaySeconds: 5
+          timeoutSeconds: 1
+          periodSeconds: 15
+          successThreshold: 1
+          failureThreshold: 1
+        terminationMessagePath: "/dev/termination-log"
+        terminationMessagePolicy: File
       restartPolicy: Always
\ No newline at end of file

diff --git a/ric-aux/80-Auxiliary-Functions/helm/ves/values.yaml b/ric-aux/80-Auxiliary-Functions/helm/ves/values.yaml
index b193e0b..41c24ba 100644 (file)
--- a/ric-aux/80-Auxiliary-Functions/helm/ves/values.yaml
+++ b/ric-aux/80-Auxiliary-Functions/helm/ves/values.yaml
@@ -20,9 +20,9 @@
 # This is a YAML-formatted file.
 # Declare variables to be passed into your templates.
 
+imagePullPolicy: IfNotPresent
 ves:
   onapRepository: "nexus3.onap.org:10001"
-  imagePullPolicy: IfNotPresent
 
   image:
     name: onap/org.onap.dcaegen2.collectors.ves.vescollector