From ba2334f32e7ab444096764765fdc8f4320e2363e Mon Sep 17 00:00:00 2001
From: "ryan.kuba" <ryan.kuba@kasmweb.com>
Date: Tue, 27 Jun 2023 16:14:51 -0400
Subject: [PATCH] KASM-3718 fix manifesting logic check and shift back to nano
 instances for testing

---
 .gitlab-ci.yml         | 4 ++--
 ci-scripts/manifest.sh | 8 ++------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e03f672..6bd554b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -101,7 +101,7 @@ test_multi:
       - $DOCKERHUB_REVERT
       - $REVERT_IS_ROLLING
   tags:
-    - aws-autoscale
+    - aws-autoscale-nano
   parallel:
     matrix:
       - ARCH: [ "x86_64", "aarch64" ]
@@ -120,7 +120,7 @@ test_single:
       - $DOCKERHUB_REVERT
       - $REVERT_IS_ROLLING
   tags:
-    - aws-autoscale
+    - aws-autoscale-nano
   parallel:
     matrix:
       - BUILD_META: *SINGLE_ARCH_BUILDS
diff --git a/ci-scripts/manifest.sh b/ci-scripts/manifest.sh
index 14dfc5f..1528570 100755
--- a/ci-scripts/manifest.sh
+++ b/ci-scripts/manifest.sh
@@ -7,10 +7,6 @@ FAILED="false"
 ## Parse input ##
 NAME1=$(echo $1| awk -F'|' '{print $1}')
 NAME2=$(echo $1| awk -F'|' '{print $2}')
-BASE=$(echo $1| awk -F'|' '{print $3}')
-BG=$(echo $1| awk -F'|' '{print $4}')
-DISTRO=$(echo $1| awk -F'|' '{print $5}')
-DOCKERFILE=$(echo $1| awk -F'|' '{print $6}')
 TYPE=$2
 REVERT_PIPELINE_ID=$3
 IS_ROLLING=$4
@@ -48,7 +44,7 @@ if [ -z "${REVERT_PIPELINE_ID}" ]; then
   for ARCH in "${ARCHES[@]}"; do
 
     # Determine test status
-    STATUS=$(curl -sL https://kasm-ci.s3.amazonaws.com/${CI_COMMIT_SHA}/${ARCH}/kasmweb/image-cache-private/${ARCH}-${KASM_IMAGE}-${PULL_BRANCH}-${CI_PIPELINE_ID}/ci-status.yml | awk -F'"' '{print $2}')
+    STATUS=$(curl -sL https://kasm-ci.s3.amazonaws.com/${CI_COMMIT_SHA}/${ARCH}/kasmweb/image-cache-private/${ARCH}-core-${NAME1}-${NAME2}-${PULL_BRANCH}-${CI_PIPELINE_ID}/ci-status.yml | awk -F'"' '{print $2}')
     if [ "${STATUS}" == "PASS" ]; then
       STATE=success
     else
@@ -57,7 +53,7 @@ if [ -z "${REVERT_PIPELINE_ID}" ]; then
     fi
 
     # Ping gitlab api with link output
-    curl --request POST --header "PRIVATE-TOKEN:${GITLAB_API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/statuses/${CI_COMMIT_SHA}?state=${STATE}&name=${KASM_IMAGE}_${ARCH}&target_url=https://kasm-ci.s3.amazonaws.com/${CI_COMMIT_SHA}/${ARCH}/kasmweb/image-cache-private/${ARCH}-${KASM_IMAGE}-${PULL_BRANCH}-${CI_PIPELINE_ID}/index.html"
+    curl --request POST --header "PRIVATE-TOKEN:${GITLAB_API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/statuses/${CI_COMMIT_SHA}?state=${STATE}&name=core-${NAME1}-${NAME2}_${ARCH}&target_url=https://kasm-ci.s3.amazonaws.com/${CI_COMMIT_SHA}/${ARCH}/kasmweb/image-cache-private/${ARCH}-core-${NAME1}-${NAME2}-${PULL_BRANCH}-${CI_PIPELINE_ID}/index.html"
 
   done
 fi