Skip to content

Commit

Permalink
remove tests for deprecated images
Browse files Browse the repository at this point in the history
  • Loading branch information
tobybellwood committed Oct 29, 2023
1 parent 2e10de9 commit 26aa19a
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 60 deletions.
19 changes: 0 additions & 19 deletions helpers/TESTING_base_images_dockercompose.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ Run the following commands to validate things are rolling as they should.
```bash
# should have all the services we expect
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep commons
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep node-16
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep node-18
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep node-20
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep php-8-0-dev
Expand All @@ -44,7 +43,6 @@ docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep php-8-1-prod
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep php-8-2-dev
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep php-8-2-prod
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep python-3-7
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep python-3-8
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep python-3-9
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep python-3-10
Expand Down Expand Up @@ -182,17 +180,6 @@ docker-compose exec -T commons sh -c "curl -kL http://php-8-2-prod:9000" | grep
docker-compose exec -T commons sh -c "curl -kL http://php-8-2-prod:9000" | grep "upload_max_filesize" | grep "1024M"
docker-compose exec -T commons sh -c "curl -kL http://php-8-2-prod:9000" | grep "error_reporting" | grep "22519"

# python-3-7 should be version 3.7
docker-compose exec -T python-3-7 sh -c "python -V" | grep "3.7"

# python-3-7 should have basic tools installed
docker-compose exec -T python-3-7 sh -c "pip list --no-cache-dir" | grep "pip"
docker-compose exec -T python-3-7 sh -c "pip list --no-cache-dir" | grep "setuptools"
docker-compose exec -T python-3-7 sh -c "pip list --no-cache-dir" | grep "virtualenv" | grep "16.7.10"

# python-3-7 should be serving content
docker-compose exec -T commons sh -c "curl python-3-7:3000/tmp/test" | grep "Python 3.7"

# python-3-8 should be version 3.8
docker-compose exec -T python-3-8 sh -c "python -V" | grep "3.8"

Expand Down Expand Up @@ -237,12 +224,6 @@ docker-compose exec -T python-3-11 sh -c "pip list --no-cache-dir" | grep "virtu
# python-3-10 should be serving content
docker-compose exec -T commons sh -c "curl python-3-11:3000/tmp/test" | grep "Python 3.11"

# node-16 should have Node 16
docker-compose exec -T node-16 sh -c "node -v" | grep "v16"

# node-16 should be serving content
docker-compose exec -T commons sh -c "curl node-16:3000/test" | grep "v16"

# node-18 should have Node 18
docker-compose exec -T node-18 sh -c "node -v" | grep "v18"

Expand Down
16 changes: 2 additions & 14 deletions helpers/TESTING_service_images_dockercompose.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ docker run --rm --net all-images_default jwilder/dockerize dockerize -wait tcp:/
docker run --rm --net all-images_default jwilder/dockerize dockerize -wait tcp://postgres-15:5432 -timeout 1m
docker run --rm --net all-images_default jwilder/dockerize dockerize -wait tcp://mongo-4:27017 -timeout 1m
docker run --rm --net all-images_default jwilder/dockerize dockerize -wait tcp://rabbitmq:15672 -timeout 1m
docker run --rm --net all-images_default jwilder/dockerize dockerize -wait tcp://redis-6:6379 -timeout 1m
docker run --rm --net all-images_default jwilder/dockerize dockerize -wait tcp://redis-7:6379 -timeout 1m
docker run --rm --net all-images_default jwilder/dockerize dockerize -wait tcp://opensearch-2:9200 -timeout 1m
```

Expand All @@ -55,7 +57,6 @@ docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep postgres-14
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep postgres-15
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep rabbitmq
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep redis-5
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep redis-6
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep redis-7
docker ps --filter label=com.docker.compose.project=all-images | grep Up | grep solr-7
Expand All @@ -76,19 +77,6 @@ docker-compose exec -T rabbitmq sh -c "rabbitmq-plugins list" | grep "E" | grep
# rabbitmq should have a running RabbitMQ management page running on 15672
docker-compose exec -T commons sh -c "curl -kL http://rabbitmq:15672" | grep "RabbitMQ Management"

# redis-5 should be running Redis v5.0
docker-compose exec -T redis-5 sh -c "redis-server --version" | grep v=5.

# redis-5 should be able to see databases
docker-compose exec -T redis-5 sh -c "redis-cli CONFIG GET databases"

# redis-5 should have initialized database
docker-compose exec -T redis-5 sh -c "redis-cli dbsize"

# redis-5 should be able to read/write data
docker-compose exec -T commons sh -c "curl -kL http://internal-services-test:3000/redis-5" | grep "SERVICE_HOST=redis-5"
docker-compose exec -T commons sh -c "curl -kL http://internal-services-test:3000/redis-5" | grep "LAGOON_TEST_VAR=all-images"

# redis-6 should be running Redis v6.0
docker-compose exec -T redis-6 sh -c "redis-server --version" | grep v=6.

Expand Down
21 changes: 0 additions & 21 deletions helpers/images-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,6 @@ services:
image: uselagoon/commons:latest
<< : *default-user # uses the defined user from top

node-16:
image: uselagoon/node-16:latest
ports:
- "3000"
user: root
command: ["sh", "-c", "
npm install -g http-server;
node -v | xargs > /app/test.html;
exec http-server -p 3000
"]
node-18:
image: uselagoon/node-18:latest
ports:
Expand Down Expand Up @@ -142,16 +131,6 @@ services:
exec php -S 0.0.0.0:9000
"] # runs a webserver with phpinfo output
python-3-7:
image: uselagoon/python-3.7:latest
ports:
- "3000"
<< : *default-user # uses the defined user from top
command: ["sh", "-c", "
python -V | xargs > tmp/test;
exec python -m http.server 3000
"]
python-3-8:
image: uselagoon/python-3.8:latest
ports:
Expand Down
6 changes: 0 additions & 6 deletions helpers/services-docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -78,12 +78,6 @@ services:
- "15672"
<< : *default-user # uses the defined user from top

redis-5:
image: uselagoon/redis-5:latest
ports:
- "6379"
<< : *default-user # uses the defined user from top

redis-6:
image: uselagoon/redis-6:latest
ports:
Expand Down

0 comments on commit 26aa19a

Please sign in to comment.