Merge pull request #30 from Cray-HPE/CASMHMS-5458/coordination-for-hm…

…s-ct-helm-tests

CASMHMS-5458 Coordination for HMS CT Helm tests

.version

@@ -1 +1 @@
-1.17.0
+1.18.0

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.18.0] - 2022-06-22
+
+### Changed
+
+- Updated CT tests to hms-test:3.1.0 image as part of Helm test coordination.
+
 ## [1.17.0] - 2022-05-23
 
 ### Changed

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-(C) Copyright [2021] Hewlett Packard Enterprise Development LP
+(C) Copyright [2021-2022] Hewlett Packard Enterprise Development LP
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

runCT.sh

@@ -47,7 +47,7 @@ function cleanup() {
 # Get the base containers running
 echo "Starting containers..."
 docker-compose build --no-cache
-docker-compose up  -d cray-hbtd #this will stand up everything except for the integration test container
+docker-compose up -d cray-hbtd
 docker-compose up -d ct-tests-functional-wait-for-smd
 docker wait ${COMPOSE_PROJECT_NAME}_ct-tests-functional-wait-for-smd_1
 docker logs ${COMPOSE_PROJECT_NAME}_ct-tests-functional-wait-for-smd_1
@@ -56,10 +56,12 @@ test_result=$?
 echo "Cleaning up containers..."
 if [[ $test_result -ne 0 ]]; then
   echo "CT smoke tests FAILED!"
-#  cleanup 1
+  cleanup 1
 fi
 
+# No CT functional tests yet
 #docker-compose up --exit-code-from ct-tests-functional ct-tests-functional
+
 #test_result=$?
 # Clean up
 #echo "Cleaning up containers..."
@@ -70,4 +72,4 @@ fi
 
 # Cleanup
 echo "CT tests PASSED!"
-#cleanup 0
+cleanup 0

test/ct/Dockerfile

@@ -1,4 +1,26 @@
-FROM artifactory.algol60.net/csm-docker/stable/hms-test:3.0.0
+# MIT License
+#
+# (C) Copyright [2022] Hewlett Packard Enterprise Development LP
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
+FROM artifactory.algol60.net/csm-docker/stable/hms-test:3.1.0
 
 COPY smoke/ /src/app
 #COPY functional/ /src/app
@@ -8,7 +30,7 @@ ENV PATH="/src/libs:${PATH}"
 ENV PATH="/src/app:${PATH}"
 
 USER root
-RUN chown  -R 65534:65534 /src
+RUN chown -R 65534:65534 /src
 USER 65534:65534
 
 # this is inherited from the hms-test container

test/ct/Dockerfile.wait-for-smd.Dockerfile

@@ -1,3 +1,25 @@
+# MIT License
+#
+# (C) Copyright [2022] Hewlett Packard Enterprise Development LP
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included
+# in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
 FROM artifactory.algol60.net/csm-docker/stable/docker.io/library/alpine:3.15
 
 RUN set -x \
@@ -11,7 +33,7 @@ COPY wait-for.sh /src/app/wait-for.sh
 
 WORKDIR /src/app
 # Run as nobody
-RUN chown  -R 65534:65534 /src
+RUN chown -R 65534:65534 /src
 USER 65534:65534
 
 # this is inherited from the hms-test container

test/ct/smoke/smoke.json

@@ -1,5 +1,5 @@
 {
-  "smoke_test_name": "HBTD-smoke-tests",
+  "smoke_test_name": "hbtd-smoke-tests",
   "default_base_url": "http://cray-hbtd/",
   "test_paths": [
     {

test/ct/tavern_global_config_ct_test.yaml

@@ -1,7 +1,7 @@
-# This file contains the base common configurations for running pytest tavern tests.  It is statically generated,
-#  because we anticipate the same settings for all ct-test  containers that inherit from it.
-name: tavern_global_configuration #is this needed, used?
+# This file contains the base common configurations for running pytest tavern tests. It is statically
+# generated, because we anticipate the same settings for all CT test containers that inherit from it.
+name: tavern_global_configuration
 description: common configuration for all tavern invocations
 variables:
-  verify: false #should ssl verification happen in tavern tests? its hard coded everywhere to false (partially because the PIT would complain)
-  sls_base_url: http://cray-hbtd:28500
+  verify: false
+  hbtd_base_url: http://cray-hbtd:28500