From b84c09c1aeef5007d9611b462178d4c86c594ac0 Mon Sep 17 00:00:00 2001
From: Abhilash Raj <maxking@users.noreply.github.com>
Date: Sat, 18 Sep 2021 16:26:59 -0700
Subject: [PATCH] Remove generate tests and use static test yaml. (#515)

* Remove generate tests and use static test yaml.

Since there aren't any more variables in the test yaml, replace
the shell script with a static YAML.

* Print python version

* Remove generate test step
---
 .circleci/config.yml                          | 5 ++---
 build.sh                                      | 3 +++
 tests/{generate_tests.sh => docker-test.yaml} | 4 ----
 tests/test.sh                                 | 4 ++--
 4 files changed, 7 insertions(+), 9 deletions(-)
 rename tests/{generate_tests.sh => docker-test.yaml} (81%)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c87badb..cf1170a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -28,9 +28,6 @@ jobs:
           key: python-deps-cache-v1
           paths:
             - /root/.cache
-      - run:
-          name: Generate Tests
-          command: bash tests/generate_tests.sh
       - run:
           environment:
             DB: postgres
@@ -42,7 +39,9 @@ jobs:
           name: MySQL Test
           command: bash tests/test.sh
       - deploy:
+          name: Deploy
           command: |
+              python3 --version
               python3 deploy.py
 
 workflows:
diff --git a/build.sh b/build.sh
index 7c3c14a..370d621 100755
--- a/build.sh
+++ b/build.sh
@@ -2,6 +2,9 @@
 
 set -ex
 
+# Since all the dockerfiles now require buildkit features.
+export DOCKER_BUILDKIT=1
+
 # Set the default value of BUILD_ROLLING to no.
 export BUILD_ROLLING="${1:-no}"
 
diff --git a/tests/generate_tests.sh b/tests/docker-test.yaml
similarity index 81%
rename from tests/generate_tests.sh
rename to tests/docker-test.yaml
index dbc6cb6..950bbf3 100644
--- a/tests/generate_tests.sh
+++ b/tests/docker-test.yaml
@@ -1,6 +1,3 @@
-#!/bin/sh
-
-cat > docker-test.yaml <<EOF
 version: '2'
 
 services:
@@ -11,4 +8,3 @@ services:
     image: maxking/mailman-web:rolling
     environment:
     - SECRET_KEY=abcdefghijklmnopqrstuv
-EOF
diff --git a/tests/test.sh b/tests/test.sh
index 6babf74..58f6a69 100755
--- a/tests/test.sh
+++ b/tests/test.sh
@@ -4,10 +4,10 @@ set -e
 # If the DB environment variable is not set, use postgres.x
 if [ "$DB" = "postgres" ] || [ -z $DB ]
 then
-	docker-compose -f docker-compose.yaml -f docker-test.yaml up -d
+	docker-compose -f docker-compose.yaml -f tests/docker-test.yaml up -d
 elif [ "$DB" = "mysql" ]
 then
-	docker-compose -f docker-compose-mysql.yaml -f docker-test.yaml up -d
+	docker-compose -f docker-compose-mysql.yaml -f tests/docker-test.yaml up -d
 fi
 
 # Print the IP Addresses of the Containers.