Merge pull request #11 from Cray-HPE/bugfix/CASMHMS-4990-csm-1.2

CASMHMS-4990 Fix HSM Compatibility Issue with CMM Firmware CSM v1.2
Cray-HPE · Jul 30, 2021 · d54d0f5 · d54d0f5
2 parents 174bb12 + 1eae591
commit d54d0f5
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/.version b/.version
@@ -1 +1 @@
-1.30.9
+1.30.10
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [1.30.10] - 2021-07-30
+
+### Changed
+
+- CASMHMS-4990 - Add "HPE" to the match list for Cray manufacturer.
+
 ## [1.30.9] - 2021-07-26
 
 ### Added

diff --git a/Jenkinsfile.github b/Jenkinsfile.github
@@ -18,6 +18,7 @@ pipeline {
         DOCKER_ARGS = getDockerBuildArgs(name: "hms-smd", description: env.DESCRIPTION, version: env.VERSION)
         CHART_NAME = "cray-hms-smd"
         CHART_VERSION = getChartVersion(version: env.VERSION)
+		DOCKERFILE = "Dockerfile.smd"
     }
 
     stages {
@@ -48,7 +49,7 @@ pipeline {
         stage("Publish") {
             steps {
                 script {
-                    publishCsmDockerImage(image: env.NAME, tag: env.VERSION, isStable: env.IS_STABLE)
+                    publishCsmDockerImage(image: env.NAME, tag: env.VERSION, isStable: env.IS_STABLE, snykTargetFile: env.DOCKERFILE, snykSeverity: 'high')
                     publishCsmHelmCharts(component: env.CHART_NAME, chartsPath: "${WORKSPACE}/kubernetes/.packaged", isStable: env.IS_STABLE)
                 }
             }

diff --git a/kubernetes/cray-hms-smd/Chart.yaml b/kubernetes/cray-hms-smd/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v1
 description: "Kubernetes resources for cray-hms-smd"
 name: "cray-hms-smd"
 home: "HMS/hms-smd"
-version: 1.30.9
+version: 1.30.10
diff --git a/pkg/redfish/rfendpoints.go b/pkg/redfish/rfendpoints.go
@@ -1836,7 +1836,7 @@ func IsManufacturer(mfrCheckStr, mfr string) int {
 		for _, s := range split {
 			switch mfr {
 			case CrayMfr:
-				if s == "cray" || s == "crayinc" || s == "crayincorporated" {
+				if s == "cray" || s == "crayinc" || s == "crayincorporated" || s == "hpe" {
 					return 1
 				}
 			case IntelMfr: