Skip restore step

With the new cache setup, there is no need for me to run the cache
restore before doing a download. However, it is now once again necessary
that download begin AFTER the dynamic scripts have already executed
their bits
This commit is contained in:
Greg Hellings
2024-06-26 21:56:19 -05:00
parent edffd23802
commit 810008b1ea
2 changed files with 17 additions and 19 deletions
+2 -2
View File
@@ -20,7 +20,7 @@ stages:
EXCEPT: '-except=upload' EXCEPT: '-except=upload'
needs: needs:
- pipeline: $PARENT_PIPELINE_ID - pipeline: $PARENT_PIPELINE_ID
job: distros job: continue
artifacts: true artifacts: true
- pipeline: $PARENT_PIPELINE_ID - pipeline: $PARENT_PIPELINE_ID
job: generate job: generate
@@ -82,7 +82,7 @@ hyperv-iso.amd64:
script: echo "Tagging as released" script: echo "Tagging as released"
needs: needs:
- pipeline: $PARENT_PIPELINE_ID - pipeline: $PARENT_PIPELINE_ID
job: distros job: continue
artifacts: true artifacts: true
release: release:
tag_name: '$CI_COMMIT_TAG' tag_name: '$CI_COMMIT_TAG'
+15 -17
View File
@@ -1,6 +1,6 @@
stages: stages:
- generate - generate
- lint - check
- trigger - trigger
variables: variables:
@@ -20,7 +20,7 @@ generate:
bash "./${vars}" bash "./${vars}"
done done
distros: continue:
stage: generate stage: generate
artifacts: artifacts:
reports: reports:
@@ -34,8 +34,14 @@ distros:
- cp result .gitlab-ci-build.yml - cp result .gitlab-ci-build.yml
- cat result - cat result
shellcheck:
stage: generate
tags:
- nix
script: nix run ".#shellcheck"
validate: validate:
stage: lint stage: check
tags: tags:
- nix - nix
needs: needs:
@@ -48,22 +54,15 @@ validate:
- ./packer_config/ - ./packer_config/
script: nix run ".#validate" script: nix run ".#validate"
shellcheck: # Makes sure that all of the ISO files we are looking for are
stage: lint # present on the S3 buckets that we use
tags:
- nix
script: nix run ".#shellcheck"
# Downloads all the ISO files so that we have a single cache with all
# of them present. This prevents a race condition where some of the
# files were being downloaded multiple times due to parallel jobs, and
# others were disappearing (e.g. daily builds for Rawhide) before we
# could get to them
downloads: downloads:
stage: generate stage: check
retry: 2 retry: 2
tags: tags:
- nix - nix
needs:
- generate
cache: cache:
- key: - key:
files: files:
@@ -71,7 +70,6 @@ downloads:
paths: paths:
- ./packer_config/ - ./packer_config/
script: script:
- nix run ".#cache-restore"
- nix run ".#cache" - nix run ".#cache"
trigger: trigger:
@@ -79,6 +77,6 @@ trigger:
trigger: trigger:
include: include:
- artifact: .gitlab-ci-build.yml - artifact: .gitlab-ci-build.yml
job: distros job: continue
variables: variables:
PARENT_PIPELINE_ID: $CI_PIPELINE_ID PARENT_PIPELINE_ID: $CI_PIPELINE_ID