From e75f493cc05ea7df61307c3ff8011a286a3f27ff Mon Sep 17 00:00:00 2001
From: Marc-Olivier Andrez <marc-olivier.andrez@desy.de>
Date: Mon, 27 May 2024 17:40:41 +0200
Subject: [PATCH] ci: add argument to specify build directory to deploy
The script `deploy/build_env/services-linux/run_asapo.sh` now can deploy
directories other than `build/`. This enables us to store different
builds under the `build/` directory.
---
deploy/build_env/services-linux/run_asapo.sh | 18 ++++++++++--------
1 file changed, 10 insertions(+), 8 deletions(-)
diff --git a/deploy/build_env/services-linux/run_asapo.sh b/deploy/build_env/services-linux/run_asapo.sh
index 90ebf5ef6..e6116fa52 100755
--- a/deploy/build_env/services-linux/run_asapo.sh
+++ b/deploy/build_env/services-linux/run_asapo.sh
@@ -1,10 +1,13 @@
-cp build/authorizer/asapo-authorizer /asapo-authorizer
-cp build/discovery/asapo-discovery /asapo-discovery
-cp build/broker/asapo-broker /asapo-broker
-cp build/file_transfer/asapo-file-transfer /asapo-file-transfer
-cp build/receiver/receiver /receiver
-cp build/monitoring/monitoring_server/asapo-monitoring-server /asapo-monitoring-server
+#!/bin/bash
+build_dir="${1:-build}"
+
+cp "$build_dir"/authorizer/asapo-authorizer /asapo-authorizer
+cp "$build_dir"/discovery/asapo-discovery /asapo-discovery
+cp "$build_dir"/broker/asapo-broker /asapo-broker
+cp "$build_dir"/file_transfer/asapo-file-transfer /asapo-file-transfer
+cp "$build_dir"/receiver/receiver /receiver
+cp "$build_dir"/monitoring/monitoring_server/asapo-monitoring-server /asapo-monitoring-server
cp deploy/asapo_services_light/*json /
cp deploy/asapo_services_light/envoy.yaml /
@@ -18,7 +21,7 @@ cp deploy/build_env/services-linux/discovery.json /
cp deploy/build_env/services-linux/*key /
cp deploy/build_env/services-linux/supervisord.conf /etc/
-cp build/deploy/asapo_services_light/nginx.conf /etc/nginx/nginx.conf
+cp "$build_dir"/deploy/asapo_services_light/nginx.conf /etc/nginx/nginx.conf
service slapd start
ldapadd -x -D "ou=rgy,o=desy,c=de" -f /etc/ldap/record.ldif -h localhost
@@ -26,4 +29,3 @@ ldapadd -x -D "ou=rgy,o=desy,c=de" -f /etc/ldap/record.ldif -h localhost
cd / && supervisord --configuration /etc/supervisord.conf &
sleep 20
cd -
-
--
GitLab