From 03e921a289bb0e19f3841ed351a270602290e97a Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Fri, 17 Nov 2023 12:34:57 +0100 Subject: test: Verify fetching from just serve of absent distdir archives --- test/end-to-end/just-mr/TARGETS | 12 ++ .../just-mr/fetch-absent-distdir-archive.sh | 126 +++++++++++++++++++++ 2 files changed, 138 insertions(+) create mode 100644 test/end-to-end/just-mr/fetch-absent-distdir-archive.sh (limited to 'test') diff --git a/test/end-to-end/just-mr/TARGETS b/test/end-to-end/just-mr/TARGETS index 04c19f21..e9a4d20b 100644 --- a/test/end-to-end/just-mr/TARGETS +++ b/test/end-to-end/just-mr/TARGETS @@ -128,6 +128,17 @@ ] , "repos": ["fetch-absent-with-symlinks (data)"] } +, "fetch-absent-distdir-archive": + { "type": ["end-to-end", "with serve"] + , "name": ["fetch-absent-distdir-archive"] + , "test": ["fetch-absent-distdir-archive.sh"] + , "deps": + [ ["end-to-end", "mr-tool-under-test"] + , ["end-to-end", "tool-under-test"] + , "fetch-absent (data)" + ] + , "repos": ["fetch-absent (data)"] + } , "fetch-absent (data)": { "type": "generic" , "out_dirs": ["src"] @@ -184,6 +195,7 @@ , "absent-config" , "fetch-absent-archives" , "fetch-absent-archives-symlinks" + , "fetch-absent-distdir-archive" ] } ] diff --git a/test/end-to-end/just-mr/fetch-absent-distdir-archive.sh b/test/end-to-end/just-mr/fetch-absent-distdir-archive.sh new file mode 100644 index 00000000..cded9c4a --- /dev/null +++ b/test/end-to-end/just-mr/fetch-absent-distdir-archive.sh @@ -0,0 +1,126 @@ +#!/bin/sh +# Copyright 2023 Huawei Cloud Computing Technology Co., Ltd. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +set -eu + +env + +readonly JUST="${PWD}/bin/tool-under-test" +readonly JUST_MR="${PWD}/bin/mr-tool-under-test" +readonly LBR="${TEST_TMPDIR}/local-build-root" +readonly LBR_NON_ABSENT="${TEST_TMPDIR}/local-build-root-non-absent" +readonly OUT="${TEST_TMPDIR}/out" +readonly OUT2="${TEST_TMPDIR}/out2" +readonly OUT_NON_ABSENT="${TEST_TMPDIR}/out3" + +ARCHIVE_CONTENT=$(git hash-object src/data.tar) +echo "Archive has content $ARCHIVE_CONTENT" + +mkdir work +cd work +touch ROOT +cat > repos.json < targets/TARGETS <<'EOF' +{ "": + { "type": "generic" + , "outs": ["out.txt"] + , "cmds": + [ "tar xf data.tar" + , "head -c 1 src/4.txt > out.txt" + , "cat src/2.txt >> out.txt" + ] + , "deps": ["data.tar"] + } +} +EOF + +echo +cat repos.json +echo +CONF=$("${JUST_MR}" --norc --local-build-root "${LBR}" \ + --remote-serve-address ${SERVE} \ + -r ${REMOTE_EXECUTION_ADDRESS} \ + --fetch-absent setup) +cat $CONF +echo +"${JUST}" install --local-build-root "${LBR}" -C "${CONF}" \ + -r "${REMOTE_EXECUTION_ADDRESS}" -o "${OUT}" 2>&1 +grep 42 "${OUT}/out.txt" + +# As the last call of just-mr had --fetch-absent, all relevent information +# about the root should now be available locally, so we can build without +# a serve or remote endpoint with still (logically) fetching absent roots. +"${JUST_MR}" --norc --just "${JUST}" --local-build-root "${LBR}" \ + --fetch-absent install -o "${OUT2}" 2>&1 +grep 42 "${OUT2}/out.txt" + +# Now, on a fresh local build root, take the original description +# without any absent hint. In this way, we verify that even for +# concrete repositories fetching over the just-serve instance works +# (as we removed all other ways to get the archive). +cat > repos.json <&1 +grep 42 "${OUT_NON_ABSENT}/out.txt" + + +echo DONE -- cgit v1.2.3