Merge pull request #14 from Cray-HPE/release/csm-1.2

GitHub migration added appVersion to Chart
OpenCHAMI · Aug 3, 2021 · 313fa43 · 313fa43
2 parents ae26d35 + 309a237
commit 313fa43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -26,7 +26,7 @@
 FROM arti.dev.cray.com/baseos-docker-master-local/golang:1.16-alpine3.13 AS build-base
 
 RUN set -ex \
-    && apk update \
+    && apk -U upgrade \
     && apk add build-base
 
 # Base copies in the files we need to test/build.
@@ -98,7 +98,7 @@ ENV BSS_INIT=/etc/bss.init
 
 # Include curl in the final image.
 RUN set -ex \
-    && apk update \
+    && apk -U upgrade \
     && apk add --no-cache curl
 
 # Get the boot-script-service from the builder stage.

diff --git a/Jenkinsfile.github b/Jenkinsfile.github
@@ -29,6 +29,7 @@ pipeline {
 
         stage("Chart") {
             steps {
+                updateCsmHelmChartAppVersion(chartPath: "${WORKSPACE}/kubernetes/${CHART_NAME}", appVersion:  env.VERSION)
                 sh "make chart"
             }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,6 +29,7 @@ pipeline { @@
             stage("Chart") {
                 steps {
+                    updateCsmHelmChartAppVersion(chartPath: "${WORKSPACE}/kubernetes/${CHART_NAME}", appVersion:  env.VERSION)
                     sh "make chart"
                 }
             }
@@ Expand Down @@