Merge pull request #25 from Cray-HPE/casm-2670

Perge chart

Jenkinsfile.github

@@ -17,8 +17,6 @@ pipeline {
         VERSION = getDockerBuildVersion(isStable: env.IS_STABLE)
         DOCKER_ARGS = getDockerBuildArgs(name: "hms-hbtd", description: env.DESCRIPTION, version: env.VERSION)
         NO_CACHE = "--no-cache"
-        CHART_NAME = "cray-hms-hbtd"
-        CHART_VERSION = getChartVersion(version: env.VERSION)
         TEST_NAME = "hms-hbtd-ct-test"
         TEST_SPEC_FILE = "hms-hbtd-ct-test.spec"
         BUILD_METADATA = getRpmRevision(isStable: env.IS_STABLE)
@@ -31,13 +29,6 @@ pipeline {
             }
         }
 
-        stage("Chart") {
-            steps {
-                updateCsmHelmChartAppVersion(chartPath: "${WORKSPACE}/kubernetes/${CHART_NAME}", appVersion:  env.VERSION)
-                sh "make chart"
-            }
-        }
-
         stage("Run Unit Tests") {
             steps {
                 sh "make test"
@@ -56,7 +47,6 @@ pipeline {
             steps {
                 script {
                     publishCsmDockerImage(image: env.NAME, tag: env.VERSION, isStable: env.IS_STABLE)
-                    publishCsmHelmCharts(component: env.CHART_NAME, chartsPath: "${WORKSPACE}/kubernetes/.packaged", isStable: env.IS_STABLE)
                     publishCsmRpms(component: env.TEST_NAME, pattern: "dist/hbtd-ct-test-rpmbuild/RPMS/x86_64/*.rpm", arch: "x86_64", isStable: env.IS_STABLE)
                     publishCsmRpms(component: env.TEST_NAME, pattern: "dist/hbtd-ct-test-rpmbuild/SRPMS/*.rpm", arch: "src", isStable: env.IS_STABLE)
                 }

Makefile

@@ -25,11 +25,6 @@ NAME ?= hms-hmi-service
 export VERSION ?= $(shell cat .version)-local
 DOCKER_IMAGE ?= ${NAME}:${VERSION}
 
-# Helm Chart
-CHART_PATH ?= kubernetes
-CHART_NAME ?= cray-hms-hbtd
-CHART_VERSION ?= $(shell cat .version)
-
 # Common RPM variable
 BUILD_METADATA ?= "1~development~$(shell git rev-parse --short HEAD)"
 
@@ -41,16 +36,11 @@ TEST_SOURCE_NAME ?= ${TEST_SPEC_NAME}-${TEST_RPM_VERSION}
 TEST_BUILD_DIR ?= $(PWD)/dist/hbtd-ct-test-rpmbuild
 TEST_SOURCE_PATH := ${TEST_BUILD_DIR}/SOURCES/${TEST_SOURCE_NAME}.tar.bz2
 
-all: image chart test test_rpm
+all: image test test_rpm
 
 image:
 	docker build ${NO_CACHE} --rm --no-cache ${DOCKER_ARGS} --tag '${NAME}:${VERSION}' .
 
-chart:
-	helm repo add cray-algol60 https://artifactory.algol60.net/artifactory/csm-helm-charts
-	helm dep up ${CHART_PATH}/${CHART_NAME}
-	helm package ${CHART_PATH}/${CHART_NAME} -d ${CHART_PATH}/.packaged --version ${CHART_VERSION}
-
 test:
 	./runUnitTest.sh