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

@@ -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:

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}"
 

tests/generate_tests.sh → 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

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.