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
This commit is contained in:
@@ -28,9 +28,6 @@ jobs:
|
|||||||
key: python-deps-cache-v1
|
key: python-deps-cache-v1
|
||||||
paths:
|
paths:
|
||||||
- /root/.cache
|
- /root/.cache
|
||||||
- run:
|
|
||||||
name: Generate Tests
|
|
||||||
command: bash tests/generate_tests.sh
|
|
||||||
- run:
|
- run:
|
||||||
environment:
|
environment:
|
||||||
DB: postgres
|
DB: postgres
|
||||||
@@ -42,7 +39,9 @@ jobs:
|
|||||||
name: MySQL Test
|
name: MySQL Test
|
||||||
command: bash tests/test.sh
|
command: bash tests/test.sh
|
||||||
- deploy:
|
- deploy:
|
||||||
|
name: Deploy
|
||||||
command: |
|
command: |
|
||||||
|
python3 --version
|
||||||
python3 deploy.py
|
python3 deploy.py
|
||||||
|
|
||||||
workflows:
|
workflows:
|
||||||
|
|||||||
3
build.sh
3
build.sh
@@ -2,6 +2,9 @@
|
|||||||
|
|
||||||
set -ex
|
set -ex
|
||||||
|
|
||||||
|
# Since all the dockerfiles now require buildkit features.
|
||||||
|
export DOCKER_BUILDKIT=1
|
||||||
|
|
||||||
# Set the default value of BUILD_ROLLING to no.
|
# Set the default value of BUILD_ROLLING to no.
|
||||||
export BUILD_ROLLING="${1:-no}"
|
export BUILD_ROLLING="${1:-no}"
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
#!/bin/sh
|
|
||||||
|
|
||||||
cat > docker-test.yaml <<EOF
|
|
||||||
version: '2'
|
version: '2'
|
||||||
|
|
||||||
services:
|
services:
|
||||||
@@ -11,4 +8,3 @@ services:
|
|||||||
image: maxking/mailman-web:rolling
|
image: maxking/mailman-web:rolling
|
||||||
environment:
|
environment:
|
||||||
- SECRET_KEY=abcdefghijklmnopqrstuv
|
- SECRET_KEY=abcdefghijklmnopqrstuv
|
||||||
EOF
|
|
||||||
@@ -4,10 +4,10 @@ set -e
|
|||||||
# If the DB environment variable is not set, use postgres.x
|
# If the DB environment variable is not set, use postgres.x
|
||||||
if [ "$DB" = "postgres" ] || [ -z $DB ]
|
if [ "$DB" = "postgres" ] || [ -z $DB ]
|
||||||
then
|
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" ]
|
elif [ "$DB" = "mysql" ]
|
||||||
then
|
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
|
fi
|
||||||
|
|
||||||
# Print the IP Addresses of the Containers.
|
# Print the IP Addresses of the Containers.
|
||||||
|
|||||||
Reference in New Issue
Block a user