From c5d08c50a46f46641e00a2971b6ed8671ffdd957 Mon Sep 17 00:00:00 2001 From: Enola Knezevic <115070135+enola-dkfz@users.noreply.github.com> Date: Wed, 16 Apr 2025 15:37:55 +0200 Subject: [PATCH] chore: add BBMRI ERIC acceptance env (#294) --- bbmri/modules/eric-setup.sh | 4 ++++ bbmri/modules/eric.acc.root.crt.pem | 20 ++++++++++++++++++++ bridgehead | 5 ++++- versions/acceptance | 3 +++ 4 files changed, 31 insertions(+), 1 deletion(-) create mode 100644 bbmri/modules/eric.acc.root.crt.pem create mode 100644 versions/acceptance diff --git a/bbmri/modules/eric-setup.sh b/bbmri/modules/eric-setup.sh index d2f36bb..fd44e73 100644 --- a/bbmri/modules/eric-setup.sh +++ b/bbmri/modules/eric-setup.sh @@ -10,6 +10,10 @@ if [ "${ENABLE_ERIC}" == "true" ]; then export ERIC_BROKER_ID=broker.bbmri.samply.de export ERIC_ROOT_CERT=eric ;; + "acceptance") + export ERIC_BROKER_ID=broker-acc.bbmri-acc.samply.de + export ERIC_ROOT_CERT=eric.acc + ;; "test") export ERIC_BROKER_ID=broker-test.bbmri-test.samply.de export ERIC_ROOT_CERT=eric.test diff --git a/bbmri/modules/eric.acc.root.crt.pem b/bbmri/modules/eric.acc.root.crt.pem new file mode 100644 index 0000000..d11033c --- /dev/null +++ b/bbmri/modules/eric.acc.root.crt.pem @@ -0,0 +1,20 @@ +-----BEGIN CERTIFICATE----- +MIIDNTCCAh2gAwIBAgIUE/wu6FmI+KSMOalI65b+lI3HI4cwDQYJKoZIhvcNAQEL +BQAwFjEUMBIGA1UEAxMLQnJva2VyLVJvb3QwHhcNMjQwOTE2MTUyMzU0WhcNMzQw +OTE0MTUyNDI0WjAWMRQwEgYDVQQDEwtCcm9rZXItUm9vdDCCASIwDQYJKoZIhvcN +AQEBBQADggEPADCCAQoCggEBAOt1I1FQt2bI4Nnjtg8JBYid29cBIkDT4MMb45Jr +ays24y4R3WO7VJK9UjNduSq/A1jlA0W0A/szDf8Ojq6bBtg+uL92PTDjYH1QXwX0 +c7eMo2tvvyyrs/cb2/ovDBQ1lpibcxVmVAv042ASmil3SdqKKXpv3ATnF9I7V4cv +fwB56FChaGIov5EK+9JOMjTx6oMlBEgUFR6qq/lSqM9my0HYwUFbX2W+nT9EKEIP +9UP1eyfRZR3E/+oticnm/cS20BGCbjoYrNgLthXKyaASuhGoElKs8EZ3h9MiI+u0 +DpR0KpePhAkMLugBrgYWqkMwwD1684LfC4YVQrsLwzo5OW8CAwEAAaN7MHkwDgYD +VR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFPbXs3g3lMjH +1JMe0a5aVbN7lB92MB8GA1UdIwQYMBaAFPbXs3g3lMjH1JMe0a5aVbN7lB92MBYG +A1UdEQQPMA2CC0Jyb2tlci1Sb290MA0GCSqGSIb3DQEBCwUAA4IBAQBM5RsXb2HN +FpC1mYfocXAn20Zu4d603qmc/IqkiOWbp36pWo+jk1AxejyRS9hEpQalgSnvcRPQ +1hPEhGU+wvI0WWVi/01iNjVbXmJNPQEouXQWAT17dyp9vqQkPw8LNzpSV/qdPgbT +Z9o3sZrjUsSLsK7A7Q5ky4ePkiJBaMsHeAD+wqGwpiJ4D2Xhp8e1v36TWM0qt2EA +gySx9isx/jeGGPBmDqYB9BCal5lrihPN56jd+5pCkyXeZqKWiiXFJKXwcwxctYZc +ADHIiTLLPXE8LHTUJAO51it1NAZ1S24aMzax4eWDXcWO7/ybbx5pkYkMd6EqlKHd +8riQJIhY4huX +-----END CERTIFICATE----- \ No newline at end of file diff --git a/bridgehead b/bridgehead index cbe7527..395504a 100755 --- a/bridgehead +++ b/bridgehead @@ -69,7 +69,7 @@ loadVars() { if [ "$(git rev-parse --abbrev-ref HEAD)" == "main" ]; then ENVIRONMENT="production" else - ENVIRONMENT="test" + ENVIRONMENT="test" # we have acceptance environment in BBMRI ERIC and it would be more appropriate to default to that one in case the data they have in BH is real, but I'm gonna leave it as is for backward compatibility fi fi # Source the versions of the images components @@ -80,6 +80,9 @@ loadVars() { "test") source ./versions/test ;; + "acceptance") + source ./versions/acceptance + ;; *) report_error 7 "Environment \"$ENVIRONMENT\" is unknown. Assuming production. FIX THIS!" source ./versions/prod diff --git a/versions/acceptance b/versions/acceptance new file mode 100644 index 0000000..7d66e03 --- /dev/null +++ b/versions/acceptance @@ -0,0 +1,3 @@ +FOCUS_TAG=develop +BEAM_TAG=develop +BLAZE_TAG=main \ No newline at end of file