3 files changed, 5 insertions, 35 deletions
diff --git a/test/end-to-end/remote-execution/large-blobs.sh b/test/end-to-end/remote-execution/large-blobs.sh
index a4d25ffa..21804977 100644
--- a/test/end-to-end/remote-execution/large-blobs.sh
+++ b/test/end-to-end/remote-execution/large-blobs.sh
@@ -17,7 +17,6 @@
 set -eu
 
 readonly JUST="${PWD}/bin/tool-under-test"
-readonly CREDENTIALS_DIR="${PWD}/credentials"
 
 # create a sufficiently large (>4MB) file for testing upload/download (16MB)
 dd if=/dev/zero of=large.file bs=1024 count=$((16*1024))
@@ -49,17 +48,8 @@ run_tests() {
         TYPE="remote"
         REMOTE_ARGS="-r $1"
         REMOTE_BUILD_ARGS="--remote-execution-property $2"
-        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
-        fi
     fi
-    ARGS="$COMMON_ARGS $REMOTE_ARGS ${AUTH_ARGS}"
+    ARGS="$COMMON_ARGS $REMOTE_ARGS"
     BUILD_ARGS="$ARGS $REMOTE_BUILD_ARGS"
 
     echo
diff --git a/test/end-to-end/remote-execution/native-protocol.sh b/test/end-to-end/remote-execution/native-protocol.sh
index 0bc2c488..3257570f 100644
--- a/test/end-to-end/remote-execution/native-protocol.sh
+++ b/test/end-to-end/remote-execution/native-protocol.sh
@@ -23,7 +23,6 @@ readonly LBRDIR="${TEST_TMPDIR}/local-build-root"
 readonly JUST_MR="${PWD}/bin/mr-tool-under-test"
 readonly JUST="${PWD}/bin/tool-under-test"
 readonly RESULT="out.txt"
-readonly CREDENTIALS_DIR="${PWD}/credentials"
 
 echo
 echo Create Git repository
@@ -85,23 +84,14 @@ echo
 TREE_ID="$(jq -r ".${OUT_DIRNAME}.id" "${RESULT}" 2>&1)"
 test ${TREE_ID} ${EQUAL} ${GIT_TREE_ID}
 
-AUTH_ARGS=""
 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}/client.key" ]; then
-    AUTH_ARGS=" --tls-client-key ${CREDENTIALS_DIR}/client.key "${AUTH_ARGS}
-  fi
-fi
+
 echo
 echo Upload and download Git tree to remote CAS in ${NAME} mode
 echo
-"${JUST}" build -C "${CONF}" --main test test ${REMOTE_EXECUTION_ARGS} ${AUTH_ARGS} --local-build-root="${LBRDIR}" --dump-artifacts "${RESULT}" ${ARGS} 2>&1
+"${JUST}" build -C "${CONF}" --main test test ${REMOTE_EXECUTION_ARGS} --local-build-root="${LBRDIR}" --dump-artifacts "${RESULT}" ${ARGS} 2>&1
 TREE_ID="$(jq -r ".${OUT_DIRNAME}.id" "${RESULT}" 2>&1)"
 test ${TREE_ID} ${EQUAL} ${GIT_TREE_ID}
diff --git a/test/end-to-end/remote-execution/upload-test.sh b/test/end-to-end/remote-execution/upload-test.sh
index 6a3a2978..5ab88955 100644
--- a/test/end-to-end/remote-execution/upload-test.sh
+++ b/test/end-to-end/remote-execution/upload-test.sh
@@ -19,7 +19,6 @@ set -eu
 readonly JUST="${PWD}/bin/tool-under-test"
 readonly GITDIR="${TEST_TMPDIR}/src"
 readonly LBRDIR="${TEST_TMPDIR}/local-build-root"
-readonly CREDENTIALS_DIR="${PWD}/credentials"
 
 mkdir -p ${GITDIR}
 cd ${GITDIR}
@@ -58,18 +57,9 @@ export CONF="$(realpath repos.json)"
 "${JUST}" build -C "${CONF}" --local-build-root="${LBRDIR}" ${ARGS} 2>&1
 
 # Build remotely
-AUTH_ARGS=""
 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}/client.key" ]; then
-    AUTH_ARGS=" --tls-client-key ${CREDENTIALS_DIR}/client.key "${AUTH_ARGS}
-  fi
-fi
-"${JUST}" build -C "${CONF}" --local-build-root="${LBRDIR}" ${ARGS} ${REMOTE_EXECUTION_ARGS} ${AUTH_ARGS} 2>&1
+
+"${JUST}" build -C "${CONF}" --local-build-root="${LBRDIR}" ${ARGS} ${REMOTE_EXECUTION_ARGS} 2>&1