build__all.sh

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

build__common.sh

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

build__pilot-lafede.sh

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

build__pilot-pangea.sh

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

build__pilot-setem.sh

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

build__pilot-test.sh

@@ -13,15 +13,11 @@ main() {
         #   common_end
         . ./build__common.sh
 
-        target='instance-autotest'
+        pilot='pilot-test'
-
-        idhub1="idhub__${target}"
 
+        idhub1="idhub__${pilot}"
         common_start
 
-        # no data persistence: cleanup previous possible data
-        rm -rf "./${idhub1}" "./${idhub2}"
-
         # detect if is new
         if [ ! -f "./${idhub1}" ]; then
                 echo 'Detected new deployment, recreating idhub git repo'

build__pilot-xo9b.sh

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

docker-compose__pilot-test.yml

@@ -5,9 +5,7 @@ services:
     init: true
     image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest
     environment:
-      #- DEPLOYMENT=${IDHUB_PILOT_TEST__IDHUB_DEPLOYMENT}
+      - DEPLOYMENT=${IDHUB_PILOT_TEST__IDHUB_DEPLOYMENT}
-      # temp disable 2fa login
-      - DEPLOYMENT=DEVELOPMENT
       - ADMIN_EMAIL=${IDHUB_PILOT_TEST__ADMIN_EMAIL}
       - SECRET_KEY=${IDHUB_SECRET_KEY:-publicsecretisnotsecureVtmKBfxpVV47PpBCF2Nzz2H6qnbd}
       - ALLOWED_HOSTS=${IDHUB_ALLOWED_HOSTS:-*}