From eafa806ea012f738789a4a258a10e50f6d9739dd Mon Sep 17 00:00:00 2001
From: Klaus Aehlig <klaus.aehlig@huawei.com>
Date: Mon, 27 Feb 2023 11:49:54 +0100
Subject: Switch shell tests to use just as remote execution endpoint

... and, in this way, ensure the test also tests properly in
absence of an external remote execution system.
---
 test/end-to-end/remote-execution/upload-test.sh | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'test/end-to-end/remote-execution/upload-test.sh')

diff --git a/test/end-to-end/remote-execution/upload-test.sh b/test/end-to-end/remote-execution/upload-test.sh
index 40d2628b..6a3a2978 100644
--- a/test/end-to-end/remote-execution/upload-test.sh
+++ b/test/end-to-end/remote-execution/upload-test.sh
@@ -59,19 +59,17 @@ export CONF="$(realpath repos.json)"
 
 # Build remotely
 AUTH_ARGS=""
-if [ "${REMOTE_EXECUTION_ADDRESS:-}" != "" ]; then
-  REMOTE_EXECUTION_ARGS="-r ${REMOTE_EXECUTION_ADDRESS}"
-  if [ "${REMOTE_EXECUTION_PROPERTIES:-}" != "" ]; then
-    REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} --remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}"
+REMOTE_EXECUTION_ARGS="-r ${REMOTE_EXECUTION_ADDRESS}"
+if [ "${REMOTE_EXECUTION_PROPERTIES:-}" != "" ]; then
+  REMOTE_EXECUTION_ARGS="${REMOTE_EXECUTION_ARGS} --remote-execution-property ${REMOTE_EXECUTION_PROPERTIES}"
+fi
+if [ -f "${CREDENTIALS_DIR}/ca.crt" ]; then
+  AUTH_ARGS=" --tls-ca-cert ${CREDENTIALS_DIR}/ca.crt "
+  if [ -f "${CREDENTIALS_DIR}/client.crt" ]; then
+    AUTH_ARGS=" --tls-client-cert ${CREDENTIALS_DIR}/client.crt "${AUTH_ARGS}
   fi
-  if [ -f "${CREDENTIALS_DIR}/ca.crt" ]; then
-    AUTH_ARGS=" --tls-ca-cert ${CREDENTIALS_DIR}/ca.crt "
-    if [ -f "${CREDENTIALS_DIR}/client.crt" ]; then
-      AUTH_ARGS=" --tls-client-cert ${CREDENTIALS_DIR}/client.crt "${AUTH_ARGS}
-    fi
-    if [ -f "${CREDENTIALS_DIR}/client.key" ]; then
-      AUTH_ARGS=" --tls-client-key ${CREDENTIALS_DIR}/client.key "${AUTH_ARGS}
-    fi
+  if [ -f "${CREDENTIALS_DIR}/client.key" ]; then
+    AUTH_ARGS=" --tls-client-key ${CREDENTIALS_DIR}/client.key "${AUTH_ARGS}
   fi
-  "${JUST}" build -C "${CONF}" --local-build-root="${LBRDIR}" ${ARGS} ${REMOTE_EXECUTION_ARGS} ${AUTH_ARGS} 2>&1
 fi
+"${JUST}" build -C "${CONF}" --local-build-root="${LBRDIR}" ${ARGS} ${REMOTE_EXECUTION_ARGS} ${AUTH_ARGS} 2>&1
-- 
cgit v1.2.3