From a355e270b1cbd90dc6c4de7a196956467ee1f45d Mon Sep 17 00:00:00 2001 From: pedro Date: Tue, 6 Feb 2024 15:32:51 +0100 Subject: [PATCH] new generic pilot and instances autotest & nightly --- build__all.sh | 2 ++ build__instance-nightly.sh | 26 +++++++++++++++++++++ build__pilot-generic.sh | 25 ++++++++++++++++++++ docker-compose__instance-autotest.yml | 4 ++-- docker-compose__instance-nightly.yml | 33 +++++++++++++++++++++++++++ docker-compose__pilot-generic.yml | 30 ++++++++++++++++++++++++ 6 files changed, 118 insertions(+), 2 deletions(-) create mode 100755 build__instance-nightly.sh create mode 100755 build__pilot-generic.sh create mode 100644 docker-compose__instance-nightly.yml create mode 100644 docker-compose__pilot-generic.yml diff --git a/build__all.sh b/build__all.sh index 75f2683..dd98497 100755 --- a/build__all.sh +++ b/build__all.sh @@ -17,6 +17,8 @@ main() { ./build__pilot-lafede.sh ./build__instance-autotest.sh + ./build__pilot-generic.sh + ./build__instance-nightly.sh # pangea pilot the last because is the heavier # TODO enable it, temp disabled to optimize server resources diff --git a/build__instance-nightly.sh b/build__instance-nightly.sh new file mode 100755 index 0000000..0fc72d6 --- /dev/null +++ b/build__instance-nightly.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +set -e +set -u +# DEBUG +set -x + +main() { + cd "$(dirname "${0}")" + + # includes functions: + # common_start + # common_end + . ./build__common.sh + + # vars used in common_start and end + target='instance-nightly' + persistence='n' + idhubs='idhub' + + common_start + + common_end +} + +main "${@}" diff --git a/build__pilot-generic.sh b/build__pilot-generic.sh new file mode 100755 index 0000000..0ea47a2 --- /dev/null +++ b/build__pilot-generic.sh @@ -0,0 +1,25 @@ +#!/bin/sh + +set -e +set -u +# DEBUG +set -x + +main() { + cd "$(dirname "${0}")" + + # includes functions: + # common_start + # common_end + . ./build__common.sh + + # vars used in common_start and end + target='pilot-generic' + idhubs='idhub' + + common_start + + common_end +} + +main "${@}" diff --git a/docker-compose__instance-autotest.yml b/docker-compose__instance-autotest.yml index a898f79..eb6d109 100644 --- a/docker-compose__instance-autotest.yml +++ b/docker-compose__instance-autotest.yml @@ -17,8 +17,8 @@ services: - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER} - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD} - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL} - - DOMAIN=https://idhub.demo.pangea.org - - CSRF_TRUSTED_ORIGINS=https://idhub.demo.pangea.org + - DOMAIN=https://idhub-autotest.demo.pangea.org + - CSRF_TRUSTED_ORIGINS=https://idhub-autotest.demo.pangea.org - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} - EMAIL_HOST=${IDHUB_EMAIL_HOST} - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER} diff --git a/docker-compose__instance-nightly.yml b/docker-compose__instance-nightly.yml new file mode 100644 index 0000000..e44aebe --- /dev/null +++ b/docker-compose__instance-nightly.yml @@ -0,0 +1,33 @@ +version: "3.9" +services: + + idhub: + init: true + image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest + environment: + #- 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:-*} + - STATIC_ROOT=${IDHUB_STATIC_ROOT:-/static/} + - MEDIA_ROOT=${IDHUB_MEDIA_ROOT:-/media/} + - PORT=${IDHUB_PORT:-9001} + - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER} + - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD} + - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL} + - DOMAIN=https://idhub-nightly.demo.pangea.org + - CSRF_TRUSTED_ORIGINS=https://idhub-nightly.demo.pangea.org + - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} + - EMAIL_HOST=${IDHUB_EMAIL_HOST} + - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER} + - EMAIL_HOST_PASSWORD=${IDHUB_EMAIL_HOST_PASSWORD} + - EMAIL_PORT=${IDHUB_EMAIL_PORT} + - EMAIL_USE_TLS=${IDHUB_EMAIL_USE_TLS} + - EMAIL_BACKEND=${IDHUB_EMAIL_BACKEND} + - SUPPORTED_CREDENTIALS=['FederationMembership', 'CourseCredential'] + ports: + - 9061:9001 + volumes: + - ./idhub__instance-nightly:/opt/idhub diff --git a/docker-compose__pilot-generic.yml b/docker-compose__pilot-generic.yml new file mode 100644 index 0000000..8f29614 --- /dev/null +++ b/docker-compose__pilot-generic.yml @@ -0,0 +1,30 @@ +version: "3.9" +services: + + idhub1: + init: true + image: dkr-dsg.ac.upc.edu/trustchain-oc1-orchestral/idhub:latest + environment: + - DEPLOYMENT=${IDHUB_DEPLOYMENT} + - SECRET_KEY=${IDHUB_SECRET_KEY:-publicsecretisnotsecureVtmKBfxpVV47PpBCF2Nzz2H6qnbd} + - ALLOWED_HOSTS=${IDHUB_ALLOWED_HOSTS:-*} + - STATIC_ROOT=${IDHUB_STATIC_ROOT:-/static/} + - MEDIA_ROOT=${IDHUB_MEDIA_ROOT:-/media/} + - PORT=${IDHUB_PORT:-9001} + - DJANGO_SUPERUSER_USERNAME=${IDHUB_USER} + - DJANGO_SUPERUSER_PASSWORD=${IDHUB_PASSWD} + - DJANGO_SUPERUSER_EMAIL=${IDHUB_EMAIL} + - DOMAIN=https://idhub.demo.pangea.org + - CSRF_TRUSTED_ORIGINS=https://idhub.demo.pangea.org + - DEFAULT_FROM_EMAIL=${IDHUB_DEFAULT_FROM_EMAIL} + - EMAIL_HOST=${IDHUB_EMAIL_HOST} + - EMAIL_HOST_USER=${IDHUB_EMAIL_HOST_USER} + - EMAIL_HOST_PASSWORD=${IDHUB_EMAIL_HOST_PASSWORD} + - EMAIL_PORT=${IDHUB_EMAIL_PORT} + - EMAIL_USE_TLS=${IDHUB_EMAIL_USE_TLS} + - EMAIL_BACKEND=${IDHUB_EMAIL_BACKEND} + - SUPPORTED_CREDENTIALS=['FederationMembership', 'CourseCredential'] + ports: + - 9051:9001 + volumes: + - ./idhub1__pilot-generic:/opt/idhub