rename from pilot test to autotest instance

differentiate between instance and pilot

build common arg is target (which can be pilot or instance)
This commit is contained in:
pedro 2024-02-05 19:18:57 +01:00
parent 35b8a294a4
commit bfd6a92d6c
8 changed files with 18 additions and 16 deletions

View File

@ -15,7 +15,9 @@ main() {
./build__pilot-xo9b.sh ./build__pilot-xo9b.sh
./build__pilot-setem.sh ./build__pilot-setem.sh
./build__pilot-lafede.sh ./build__pilot-lafede.sh
./build__pilot-test.sh
./build__instance-autotest.sh
# pangea pilot the last because is the heavier # pangea pilot the last because is the heavier
# TODO enable it, temp disabled to optimize server resources # TODO enable it, temp disabled to optimize server resources
#./build__pilot-pangea.sh #./build__pilot-pangea.sh

View File

@ -6,7 +6,7 @@ set -u
#set -x #set -x
common_start() { common_start() {
figlet "${pilot}" figlet "${target}"
deployment="${1:-${deployment:-}}" deployment="${1:-${deployment:-}}"
action="${action:-deploy}" action="${action:-deploy}"
@ -16,19 +16,18 @@ common_start() {
detach='-d' detach='-d'
fi fi
# ensure uses pilot-pangea branch and it is up to date # ensure uses main branch branch and that it is up to date
( (
cd ./IdHub cd ./IdHub
if [ -d .git ]; then if [ -d .git ]; then
#git checkout ${pilot}
git checkout main git checkout main
git pull git pull
fi fi
) )
# some pilots might use idhub1 and/or idhub2 # some targets might use idhub1 and/or idhub2
idhub1="${idhub1:-idhub1__${pilot}}" idhub1="${idhub1:-idhub1__${target}}"
idhub2="${idhub2:-idhub2__${pilot}}" idhub2="${idhub2:-idhub2__${target}}"
# force recreate # force recreate
rm -rf "./${idhub1}" "./${idhub2}" rm -rf "./${idhub1}" "./${idhub2}"
@ -36,12 +35,12 @@ common_start() {
common_end() { common_end() {
dc_file="docker-compose__${pilot}.yml" dc_file="docker-compose__${target}.yml"
docker compose -p ${pilot} -f ${dc_file} down -v || true docker compose -p ${target} -f ${dc_file} down -v || true
make idhub_build make idhub_build
if [ "${action:-}" = "deploy" ]; then if [ "${action:-}" = "deploy" ]; then
docker compose -p ${pilot} -f ${dc_file} up ${detach:-} docker compose -p ${target} -f ${dc_file} up ${detach:-}
wait_seconds="${wait_seconds:-20}" wait_seconds="${wait_seconds:-20}"
echo "Give ${wait_seconds} seconds to this new deployment to be setted up" echo "Give ${wait_seconds} seconds to this new deployment to be setted up"
sleep "${wait_seconds}" sleep "${wait_seconds}"

View File

@ -13,9 +13,10 @@ main() {
# common_end # common_end
. ./build__common.sh . ./build__common.sh
pilot='pilot-test' target='instance-autotest'
idhub1="idhub__${target}"
idhub1="idhub__${pilot}"
common_start common_start
# detect if is new # detect if is new

View File

@ -13,7 +13,7 @@ main() {
# common_end # common_end
. ./build__common.sh . ./build__common.sh
pilot='pilot-lafede' target='pilot-lafede'
common_start common_start

View File

@ -13,7 +13,7 @@ main() {
# common_end # common_end
. ./build__common.sh . ./build__common.sh
pilot='pilot-pangea' target='pilot-pangea'
common_start common_start

View File

@ -13,7 +13,7 @@ main() {
# common_end # common_end
. ./build__common.sh . ./build__common.sh
pilot='pilot-setem' target='pilot-setem'
common_start common_start

View File

@ -13,7 +13,7 @@ main() {
# common_end # common_end
. ./build__common.sh . ./build__common.sh
pilot='pilot-xo9b' target='pilot-xo9b'
common_start common_start