Merge pull request #8 from Cray-HPE/GH_phase4_1.2

GH phase 4 changes 1.2
Cray-HPE · Aug 4, 2021 · 0951bcd · 0951bcd
2 parents 2155138 + 8317c0c
commit 0951bcd
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 16 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -25,7 +25,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
 
 FROM build-base AS base

diff --git a/Dockerfile.build-base b/Dockerfile.build-base
@@ -27,7 +27,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
 
 # Copy the files in for the next stages to use.

diff --git a/Jenkinsfile b/Jenkinsfile
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"
             }
         }

diff --git a/runSnyk.sh b/runSnyk.sh
@@ -21,7 +21,7 @@
 # ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
-SNYK_OPTS="--dev --show-vulnerable-paths=all --fail-on=all --severity-threshold=${SEVERITY:-high} --skip-unresolved=true --org=hpe-cray-playground --json"
+SNYK_OPTS="--dev --show-vulnerable-paths=all --fail-on=all --severity-threshold=${SEVERITY:-high} --skip-unresolved=true --json"
 
 OUT=$(set -x; snyk test --all-projects --detection-depth=999 $SNYK_OPTS)
-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 @@