From e3a9e7e3c141ca491386f369e8baefc495c31953 Mon Sep 17 00:00:00 2001
From: Fan Ting Wei <tingwei@dsaid.gov.sg>
Date: Fri, 30 Aug 2024 14:54:31 +0800
Subject: [PATCH] test

---
 .github/workflows/ci.yml | 194 +--------------------------------------
 templates/ci.yml.tmpl    |   2 +-
 2 files changed, 2 insertions(+), 194 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0e63f53..d40abea 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,198 +15,6 @@ jobs:
     strategy:
       matrix:
         version:
-        - spark:  "3.1.3"
-          hadoop: "2.7.4"
-          scala:  "2.12"
-          java:   "8"
-          python: "3.8"
-          image: "-buster"
-        - spark:  "3.1.3"
-          hadoop: "2.7.4"
-          scala:  "2.12"
-          java:   "8"
-          python: "3.9"
-          image: "-buster"
-        - spark:  "3.1.3"
-          hadoop: "3.2.0"
-          scala:  "2.12"
-          java:   "8"
-          python: "3.8"
-          image: "-buster"
-        - spark:  "3.1.3"
-          hadoop: "3.2.0"
-          scala:  "2.12"
-          java:   "8"
-          python: "3.9"
-          image: "-buster"
-        - spark:  "3.1.3"
-          hadoop: "2.7.4"
-          scala:  "2.12"
-          java:   "11"
-          python: "3.8"
-          image: "-buster"
-        - spark:  "3.1.3"
-          hadoop: "2.7.4"
-          scala:  "2.12"
-          java:   "11"
-          python: "3.9"
-          image: "-buster"
-        - spark:  "3.1.3"
-          hadoop: "3.2.0"
-          scala:  "2.12"
-          java:   "11"
-          python: "3.8"
-          image: "-buster"
-        - spark:  "3.1.3"
-          hadoop: "3.2.0"
-          scala:  "2.12"
-          java:   "11"
-          python: "3.9"
-          image: "-buster"
-        - spark:  "3.2.2"
-          hadoop: "3.3.1"
-          scala:  "2.12"
-          java:   "8"
-          python: "3.8"
-          image: "-buster"
-        - spark:  "3.2.2"
-          hadoop: "3.3.1"
-          scala:  "2.12"
-          java:   "8"
-          python: "3.9"
-          image: "-buster"
-        - spark:  "3.2.2"
-          hadoop: "3.3.1"
-          scala:  "2.13"
-          java:   "8"
-          python: "3.8"
-          image: "-buster"
-        - spark:  "3.2.2"
-          hadoop: "3.3.1"
-          scala:  "2.13"
-          java:   "8"
-          python: "3.9"
-          image: "-buster"
-        - spark:  "3.2.2"
-          hadoop: "3.3.1"
-          scala:  "2.12"
-          java:   "11"
-          python: "3.8"
-          image: "-buster"
-        - spark:  "3.2.2"
-          hadoop: "3.3.1"
-          scala:  "2.12"
-          java:   "11"
-          python: "3.9"
-          image: "-buster"
-        - spark:  "3.2.2"
-          hadoop: "3.3.1"
-          scala:  "2.13"
-          java:   "11"
-          python: "3.8"
-          image: "-buster"
-        - spark:  "3.2.2"
-          hadoop: "3.3.1"
-          scala:  "2.13"
-          java:   "11"
-          python: "3.9"
-          image: "-buster"
-        - spark:  "3.3.0"
-          hadoop: "3.3.2"
-          scala:  "2.12"
-          java:   "8"
-          python: "3.8"
-          image: "-buster"
-        - spark:  "3.3.0"
-          hadoop: "3.3.2"
-          scala:  "2.12"
-          java:   "8"
-          python: "3.9"
-          image: "-buster"
-        - spark:  "3.3.0"
-          hadoop: "3.3.2"
-          scala:  "2.13"
-          java:   "8"
-          python: "3.8"
-          image: "-buster"
-        - spark:  "3.3.0"
-          hadoop: "3.3.2"
-          scala:  "2.13"
-          java:   "8"
-          python: "3.9"
-          image: "-buster"
-        - spark:  "3.3.0"
-          hadoop: "3.3.2"
-          scala:  "2.12"
-          java:   "11"
-          python: "3.8"
-          image: "-buster"
-        - spark:  "3.3.0"
-          hadoop: "3.3.2"
-          scala:  "2.12"
-          java:   "11"
-          python: "3.9"
-          image: "-buster"
-        - spark:  "3.3.0"
-          hadoop: "3.3.2"
-          scala:  "2.13"
-          java:   "11"
-          python: "3.8"
-          image: "-buster"
-        - spark:  "3.3.0"
-          hadoop: "3.3.2"
-          scala:  "2.13"
-          java:   "11"
-          python: "3.9"
-          image: "-buster"
-        - spark:  "3.3.1"
-          hadoop: "3.3.2"
-          scala:  "2.12"
-          java:   "8"
-          python: "3.8"
-          image: "-buster"
-        - spark:  "3.3.1"
-          hadoop: "3.3.2"
-          scala:  "2.12"
-          java:   "8"
-          python: "3.9"
-          image: "-buster"
-        - spark:  "3.3.1"
-          hadoop: "3.3.2"
-          scala:  "2.13"
-          java:   "8"
-          python: "3.8"
-          image: "-buster"
-        - spark:  "3.3.1"
-          hadoop: "3.3.2"
-          scala:  "2.13"
-          java:   "8"
-          python: "3.9"
-          image: "-buster"
-        - spark:  "3.3.1"
-          hadoop: "3.3.2"
-          scala:  "2.12"
-          java:   "11"
-          python: "3.8"
-          image: "-buster"
-        - spark:  "3.3.1"
-          hadoop: "3.3.2"
-          scala:  "2.12"
-          java:   "11"
-          python: "3.9"
-          image: "-buster"
-        - spark:  "3.3.1"
-          hadoop: "3.3.2"
-          scala:  "2.13"
-          java:   "11"
-          python: "3.8"
-          image: "-buster"
-        - spark:  "3.3.1"
-          hadoop: "3.3.2"
-          scala:  "2.13"
-          java:   "11"
-          python: "3.9"
-          image: "-buster"
         - spark:  "3.4.1"
           hadoop: "3.3.4"
           scala:  "2.12"
@@ -285,7 +93,7 @@ jobs:
         if ! diff .github/workflows/ci.yml .github/workflows/ci.yml.backup; then echo "ci.yml.tmpl and ci.yml differs!" && exit 1; fi
     - name: Build Docker image
       run: |-
-        TAG_NAME="test_${SELF_VERSION}_${SPARK_VERSION}_hadoop-${HADOOP_VERSION}_scala-${SCALA_VERSION}_java-${JAVA_VERSION}_python-${PYTHON_VERSION}"
+        TAG_NAME="${SELF_VERSION}_${SPARK_VERSION}_hadoop-${HADOOP_VERSION}_scala-${SCALA_VERSION}_java-${JAVA_VERSION}_python-${PYTHON_VERSION}"
         docker build . -t "${IMAGE_NAME}:${TAG_NAME}" \
           --build-arg BASE_VERSION="${BASE_VERSION}" \
           --build-arg SPARK_VERSION="${SPARK_VERSION}" \
diff --git a/templates/ci.yml.tmpl b/templates/ci.yml.tmpl
index 3d35128..65b7287 100644
--- a/templates/ci.yml.tmpl
+++ b/templates/ci.yml.tmpl
@@ -69,7 +69,7 @@ jobs:
         if ! diff .github/workflows/ci.yml .github/workflows/ci.yml.backup; then echo "ci.yml.tmpl and ci.yml differs!" && exit 1; fi
     - name: Build Docker image
       run: |-
-        TAG_NAME="${SELF_VERSION}_${SPARK_VERSION}_hadoop-${HADOOP_VERSION}_scala-${SCALA_VERSION}_java-${JAVA_VERSION}_python-${PYTHON_VERSION}"
+        TAG_NAME="test_${SELF_VERSION}_${SPARK_VERSION}_hadoop-${HADOOP_VERSION}_scala-${SCALA_VERSION}_java-${JAVA_VERSION}_python-${PYTHON_VERSION}"
         docker build . -t "${IMAGE_NAME}:${TAG_NAME}" \
           --build-arg BASE_VERSION="${BASE_VERSION}" \
           --build-arg SPARK_VERSION="${SPARK_VERSION}" \