diff options
| author | Alberto Sartori <alberto.sartori@huawei.com> | 2023-03-09 12:10:17 +0100 |
|---|---|---|
| committer | Alberto Sartori <alberto.sartori@huawei.com> | 2023-03-10 09:38:39 +0100 |
| commit | 15fec6cd3b63e547c3cedf35b8d58b8e09d1c25f (patch) | |
| tree | 74c34d990062fd7524deb2f1d782238dafdf230c /test/end-to-end/remote-execution/native-protocol.sh | |
| parent | c3b13b4932e26805100cfafc695eed822f7c3051 (diff) | |
| download | justbuild-15fec6cd3b63e547c3cedf35b8d58b8e09d1c25f.tar.gz | |
tests: get rid of credentials repo since tests now use just execute as a remote endpoint
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} |