From 71953b9d200bc6c729e4d0ee5e76df59854bc5e1 Mon Sep 17 00:00:00 2001 From: Paul Cristian Sarbu Date: Fri, 8 Dec 2023 09:47:35 +0100 Subject: test: Check tc sharding if 'just serve' acts also as 'just execute' --- test/end-to-end/serve-service/TARGETS | 8 + .../serve-service/serve_start_execute_sharding.sh | 184 +++++++++++++++++++++ 2 files changed, 192 insertions(+) create mode 100644 test/end-to-end/serve-service/serve_start_execute_sharding.sh diff --git a/test/end-to-end/serve-service/TARGETS b/test/end-to-end/serve-service/TARGETS index 88774cbc..f90edd55 100644 --- a/test/end-to-end/serve-service/TARGETS +++ b/test/end-to-end/serve-service/TARGETS @@ -37,6 +37,13 @@ , "test": ["serve_start_execute.sh"] , "deps": [["end-to-end", "tool-under-test"]] } +, "serve-start-execute-sharding": + { "type": ["@", "rules", "shell/test", "script"] + , "name": ["serve-start-execute-sharding"] + , "test": ["serve_start_execute_sharding.sh"] + , "deps": + [["end-to-end", "mr-tool-under-test"], ["end-to-end", "tool-under-test"]] + } , "serve-export-deps": { "type": ["end-to-end", "with serve"] , "name": ["serve-export-deps"] @@ -51,6 +58,7 @@ [ "serve-target-remote-build" , "serve-target-cache-hit" , "serve-start-execute" + , "serve-start-execute-sharding" , "serve-export-deps" ] } diff --git a/test/end-to-end/serve-service/serve_start_execute_sharding.sh b/test/end-to-end/serve-service/serve_start_execute_sharding.sh new file mode 100644 index 00000000..70b7bfbc --- /dev/null +++ b/test/end-to-end/serve-service/serve_start_execute_sharding.sh @@ -0,0 +1,184 @@ +#!/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. + +########################################################################### +# +# In this script, we first fill the target cache of a just-serve instance +# by building an export target. Then, we check that just-serve can get a +# cache hit if set up to act also as just-execute. +# +# The remote properties and dispatch file are used to test that both +# client and server shard the target cache entry in the same way. +# +########################################################################### + +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 SERVE_LBR="${TEST_TMPDIR}/serve-local-build-root" + +readonly LOCAL_DIR="${TEST_TMPDIR}/local" +readonly ABSENT_DIR="${TEST_TMPDIR}/absent" + +readonly INFOFILE="${PWD}/info.json" +readonly PIDFILE="${PWD}/pid.txt" + +## +# Set up sample repository +# +readonly GENERATOR="${TEST_TMPDIR}/generate.sh" +readonly GEN_DIR="{TEST_TMPDIR}/gen-dir" +cat > "${GENERATOR}" < TARGETS < out.txt"] + , "outs": ["out.txt"] + } +, "main": + {"type": "export", "target": "main-internal", "flexible_config": ["ENV"]} +} +ENDTARGETS +EOF + +cat "${GENERATOR}" + +chmod 755 "${GENERATOR}" +mkdir -p "${GEN_DIR}" +( cd "${GEN_DIR}" + git init + git config user.email "nobody@example.org" + git config user.name "Nobody" + "${GENERATOR}" + git add . + git commit -m "first commit" +) +readonly TREE_ID=$(cd "${GEN_DIR}" && git log -n 1 --format="%T") + +## +# Fill the target cache that will be used by just serve by building locally +# +mkdir -p ${LOCAL_DIR} +( cd ${LOCAL_DIR} +touch ROOT +cat > repos.json < .just-servec <&1 & + +for _ in `seq 1 10` +do + if test -f "${INFOFILE}" + then + break + fi + sleep 1; +done + +if ! test -f "${INFOFILE}" +then + echo "Did not find ${INFOFILE}" + exit 1 +fi + +readonly PORT=$(jq '."port"' "${INFOFILE}") + +cleanup() { + kill $(cat "${PIDFILE}") +} + +## +# Change repository to absent and unbuildable (remove generator script) and +# test that we can build from the populated build root, as we should get a +# target cache hit, assuming sharding is done as for a local build +# +mkdir -p "${ABSENT_DIR}" +( cd "${ABSENT_DIR}" +touch ROOT +cat > repos.json <