tests: get rid of credentials repo since tests now use just execute as a remote endpoint

7 files changed, 12 insertions, 73 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
diff --git a/test/end-to-end/target-cache/artifacts-sync.sh b/test/end-to-end/target-cache/artifacts-sync.sh
index 0767d2be..a5948cdb 100644
--- a/test/end-to-end/target-cache/artifacts-sync.sh
+++ b/test/end-to-end/target-cache/artifacts-sync.sh
@@ -57,24 +57,12 @@ readonly JUST_MR="$ROOT/foo/bin/just-mr.py"
 readonly JUST_RULES="$ROOT/foo/rules"
 readonly LBRDIR="$TEST_TMPDIR/local-build-root"
 readonly TESTDIR="$TEST_TMPDIR/test-root"
-readonly CREDENTIALS_DIR="${PWD}/credentials"
 
 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
 
-AUTH_ARGS=""
-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
-
 if [ "${COMPATIBLE:-}" = "YES" ]; then
   ARGS="--compatible"
   HASH_TYPE="compatible-sha256"
@@ -137,7 +125,7 @@ echo "Local execution ID: $LOCAL_EXECUTION_ID"
 rm -rf "$TCDIR"
 
 # Determine remote execution ID
-"$JUST_MR" --norc --just "$JUST" --local-build-root "$LBRDIR" build main $ARGS $REMOTE_EXECUTION_ARGS ${AUTH_ARGS}
+"$JUST_MR" --norc --just "$JUST" --local-build-root "$LBRDIR" build main $ARGS $REMOTE_EXECUTION_ARGS
 readonly REMOTE_EXECUTION_ID=$(ls -1 "$TCDIR" | head -n1)
 echo "Remote execution ID: $REMOTE_EXECUTION_ID"
 rm -rf "$TCDIR"
@@ -171,7 +159,7 @@ sed -i "s|RANDOM_STRING_1 \".*\"|RANDOM_STRING_1 \"$RANDOM_STRING\"|" greet/incl
 sed -i "s|RANDOM_STRING_2 \".*\"|RANDOM_STRING_2 \"$RANDOM_STRING\"|" greet/src/greet.cpp
 
 # Build greetlib remotely
-"$JUST_MR" --norc --just "$JUST" --local-build-root "$LBRDIR" --main main build main $ARGS $REMOTE_EXECUTION_ARGS ${AUTH_ARGS}
+"$JUST_MR" --norc --just "$JUST" --local-build-root "$LBRDIR" --main main build main $ARGS $REMOTE_EXECUTION_ARGS
 
 # Check if file and tree artifacts have been downloaded correctly
 EXEC_HASH=
@@ -207,7 +195,7 @@ sed -i "s|RANDOM_STRING_2 \".*\"|RANDOM_STRING_2 \"$RANDOM_STRING\"|" greet/src/
 mv "$TCDIR/$LOCAL_EXECUTION_ID" "$TCDIR/$REMOTE_EXECUTION_ID"
 
 # Check if greetlib successfully builds remotely
-"$JUST_MR" --norc --just "$JUST" --local-build-root "$LBRDIR" --main main build main $ARGS $REMOTE_EXECUTION_ARGS ${AUTH_ARGS}
+"$JUST_MR" --norc --just "$JUST" --local-build-root "$LBRDIR" --main main build main $ARGS $REMOTE_EXECUTION_ARGS
 
 # Clean up test files
 rm -rf "$TESTDIR" "$LBRDIR"
@@ -235,7 +223,7 @@ sed -i "s|\"foo\": \"[^\"]*\"|\"foo\": \"$RANDOM_STRING\"|" foo.py
 sed -i "s|\"foo\": \"[^\"]*\"|\"foo\": \"$RANDOM_STRING\"|" bar.py
 
 # Build pydicts remotely
-"$JUST_MR" --norc --just "$JUST" --local-build-root "$LBRDIR" build json_from_py $ARGS $REMOTE_EXECUTION_ARGS ${AUTH_ARGS}
+"$JUST_MR" --norc --just "$JUST" --local-build-root "$LBRDIR" build json_from_py $ARGS $REMOTE_EXECUTION_ARGS
 
 # 'exported_py' target contains a provides map,
 #   which contains an abstract node (type 'convert'),
@@ -272,7 +260,7 @@ sed -i "s|\"foo\": \"[^\"]*\"|\"foo\": \"$RANDOM_STRING\"|" bar.py
 mv "$TCDIR/$LOCAL_EXECUTION_ID" "$TCDIR/$REMOTE_EXECUTION_ID"
 
 # Check if pydicts successfully builds remotely
-"$JUST_MR" --norc --just "$JUST" --local-build-root "$LBRDIR" build json_from_py $ARGS $REMOTE_EXECUTION_ARGS ${AUTH_ARGS}
+"$JUST_MR" --norc --just "$JUST" --local-build-root "$LBRDIR" build json_from_py $ARGS $REMOTE_EXECUTION_ARGS
 
 # Clean up test files
 rm -rf "$TESTDIR" "$LBRDIR"
diff --git a/test/end-to-end/target-cache/target-cache-hit.sh b/test/end-to-end/target-cache/target-cache-hit.sh
index 0b7252ae..a074e0bd 100644
--- a/test/end-to-end/target-cache/target-cache-hit.sh
+++ b/test/end-to-end/target-cache/target-cache-hit.sh
@@ -20,7 +20,6 @@ readonly JUST="$PWD/bin/tool-under-test"
 readonly JUST_MR="$PWD/bin/mr-tool-under-test"
 readonly LBRDIR="$TEST_TMPDIR/local-build-root"
 readonly TESTDIR="$TEST_TMPDIR/test-root"
-readonly CREDENTIALS_DIR="${PWD}/credentials"
 
 # create project files including an exported target
 mkdir -p "$TESTDIR"
@@ -61,23 +60,13 @@ export CONF="$("$JUST_MR" -C repos.json --local-build-root="$LBRDIR" setup main)
 "$JUST" build -C "$CONF" main --local-build-root="$LBRDIR" $ARGS 2>&1
 
 REMOTE_EXECUTION_ARGS=""
-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}"
   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
 fi
 
 # build project twice remotely to trigger a target cache hit
-"$JUST" build -C "$CONF" main --local-build-root="$LBRDIR" $ARGS $REMOTE_EXECUTION_ARGS ${AUTH_ARGS} 2>&1
-"$JUST" build -C "$CONF" main --local-build-root="$LBRDIR" $ARGS $REMOTE_EXECUTION_ARGS ${AUTH_ARGS} 2>&1
+"$JUST" build -C "$CONF" main --local-build-root="$LBRDIR" $ARGS $REMOTE_EXECUTION_ARGS 2>&1
+"$JUST" build -C "$CONF" main --local-build-root="$LBRDIR" $ARGS $REMOTE_EXECUTION_ARGS 2>&1
diff --git a/test/etc/credentials/TARGETS b/test/etc/credentials/TARGETS
deleted file mode 100644
index 884e3c20..00000000
--- a/test/etc/credentials/TARGETS
+++ /dev/null
@@ -1,6 +0,0 @@
-{ "":
-  { "type": "install"
-  , "dirs": [[["TREE", null, "."], "credentials"]]
-  , "tainted": ["test"]
-  }
-}
diff --git a/test/etc/credentials/readme.org b/test/etc/credentials/readme.org
deleted file mode 100644
index ab2cc674..00000000
--- a/test/etc/credentials/readme.org
+++ /dev/null
@@ -1,2 +0,0 @@
-This directory backs a repository to be populated during execution of
-tests to pass files needed for, e.g., authentication.