Mirrored_Repos/psu
1
0
Fork 0
mirror of https://gitlab.com/psuapp/psu.git synced 2024-08-30 18:12:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename CLUSTER_ variables by SWARM_NODE_ when running tests

Browse Source 
CLUSTER_NAME -> SWARM_NODE_NAME
CLUSTER_IP -> SWARM_NODE_IP
This commit is contained in:
Tortue Torche 2021-02-19 12:25:44 +01:00
parent 5275fc78f2
commit 90dde1d9c9
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/dockerfiles/.env.local
View File

@ -23,5 +23,5 @@ PORTAINER_VERSION=latest
PORTAINER_COMMAND_OPTIONS=""
#PORTAINER_COMMAND_OPTIONS=" --no-analytics"
CLUSTER_NAME=localhost
CLUSTER_IP=$(hostname -I | awk '{ print $1 }')
SWARM_NODE_NAME=localhost
SWARM_NODE_IP=$(hostname -I | awk '{ print $1 }')

8
tests/run.sh
View File

@ -13,9 +13,9 @@ fi
[[ "$TRACE" ]] && set -x
CLUSTER_NAME=${CLUSTER_NAME:-cluster}
CLUSTER_IP=${CLUSTER_IP:-$(getent hosts $CLUSTER_NAME | awk '{ print $1 }')}
export BASE_DOMAIN="$CLUSTER_IP.nip.io"
SWARM_NODE_NAME=${SWARM_NODE_NAME:-cluster}
SWARM_NODE_IP=${SWARM_NODE_IP:-$(getent hosts $SWARM_NODE_NAME | awk '{ print $1 }')}
export BASE_DOMAIN="$SWARM_NODE_IP.nip.io"
export PSU_STACK_NAME="web-app"
PSU_URL="https://portainer.$BASE_DOMAIN"
PSU_USER="admin"
@ -86,7 +86,7 @@ docker swarm init
# Parse the Docker traefik stack file to deploy
envsubst '$TRAEFIK_VERSION,$BASE_DOMAIN' < dockerfiles/docker-stack-traefik.yml > dockerfiles/docker-stack-traefik-final.yml
docker stack deploy -c dockerfiles/docker-stack-traefik-final.yml traefik --with-registry-auth
bash -c "timeout 20 bash -c 'while ! (echo > /dev/tcp/$CLUSTER_NAME/443 && curl -fks --max-time 2 https://traefik.$BASE_DOMAIN) >/dev/null 2>&1; do sleep 1; done;'"
bash -c "timeout 20 bash -c 'while ! (echo > /dev/tcp/$SWARM_NODE_NAME/443 && curl -fks --max-time 2 https://traefik.$BASE_DOMAIN) >/dev/null 2>&1; do sleep 1; done;'"
# Deploy Portainer test
# Create admin password as a Docker secret