diff options
| -rwxr-xr-x | ops/pipelines/fetch-parent-targets.sh | 25 | ||||
| -rw-r--r-- | ops/pipelines/static-pipeline.yaml | 4 |
2 files changed, 15 insertions, 14 deletions
diff --git a/ops/pipelines/fetch-parent-targets.sh b/ops/pipelines/fetch-parent-targets.sh index bc334fc35cb1..d34a826279d0 100755 --- a/ops/pipelines/fetch-parent-targets.sh +++ b/ops/pipelines/fetch-parent-targets.sh @@ -3,38 +3,39 @@ set -ueo pipefail # Each Buildkite build stores the derivation target map as a pipeline # artifact. This script determines the most appropriate commit (the -# fork point of the current chain from canon) and fetches the -# artifact. +# fork point of the current chain from HEAD) and fetches the artifact. # -# Since builds can be based on canon before the pipeline for the last -# commit has finished, it is possible that the fork point has no -# target map. To account for this, we will go up to 3 commits back in -# time to find a map. +# New builds can be based on HEAD before the pipeline for the last +# commit has finished, in which case it is possible that the fork +# point has no derivation map. To account for this, up to 3 commits +# prior to HEAD are also queried to find a map. # # If no map is found, the failure mode is not critical: We simply # build all targets. +: ${DRVMAP_PATH:=pipeline/drvmap.json} + function most_relevant_builds { - git fetch -v origin canon - local FIRST=$(git merge-base --fork-point HEAD origin/canon) + git fetch -v origin "${BUILDKITE_PIPELINE_DEFAULT_BRANCH}" + local FIRST=$(git merge-base --fork-point HEAD FETCH_HEAD) local SECOND=$(git rev-parse "$FIRST~1") local THIRD=$(git rev-parse "$FIRST~2") curl 'https://graphql.buildkite.com/v1' \ --silent \ -H "Authorization: Bearer $(cat /run/agenix/buildkite-graphql-token)" \ - -d "{\"query\": \"query { pipeline(slug: \\\"tvl/depot\\\") { builds(commit: [\\\"$FIRST\\\",\\\"$SECOND\\\",\\\"$THIRD\\\"]) { edges { node { uuid }}}}}\"}" | \ + -d "{\"query\": \"query { pipeline(slug: \\\"$BUILDKITE_ORGANIZATION_SLUG/$BUILDKITE_PIPELINE_SLUG\\\") { builds(commit: [\\\"$FIRST\\\",\\\"$SECOND\\\",\\\"$THIRD\\\"]) { edges { node { uuid }}}}}\"}" | \ jq -r '.data.pipeline.builds.edges[] | .node.uuid' } mkdir -p tmp for build in $(most_relevant_builds); do echo "Checking artifacts for build $build" - buildkite-agent artifact download --build "${build}" 'pipeline/drvmap.json' 'tmp/' || true + buildkite-agent artifact download --build "${build}" "${DRVMAP_PATH}" 'tmp/' || true - if [[ -f "tmp/pipeline/drvmap.json" ]]; then + if [[ -f "tmp/${DRVMAP_PATH}" ]]; then echo "Fetched target map from build ${build}" - mv tmp/pipeline/drvmap.json parent-target-map.json + mv "tmp/${DRVMAP_PATH}" tmp/parent-target-map.json break fi done diff --git a/ops/pipelines/static-pipeline.yaml b/ops/pipelines/static-pipeline.yaml index 52f9f82039d3..ffdb6a75c5f2 100644 --- a/ops/pipelines/static-pipeline.yaml +++ b/ops/pipelines/static-pipeline.yaml @@ -21,8 +21,8 @@ steps: ops/pipelines/fetch-parent-targets.sh PIPELINE_ARGS="" - if [[ -f ./parent-target-map.json ]]; then - PIPELINE_ARGS="--arg parentTargetMap ./parent-target-map.json" + if [[ -f tmp/parent-target-map.json ]]; then + PIPELINE_ARGS="--arg parentTargetMap tmp/parent-target-map.json" fi nix-build -A ops.pipelines.depot -o pipeline --show-trace $$PIPELINE_ARGS |