diff options
Diffstat (limited to 'test/end-to-end/remote-execution/native-protocol.sh')
| -rw-r--r-- | test/end-to-end/remote-execution/native-protocol.sh | 14 |
1 files changed, 2 insertions, 12 deletions
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} |