From 438f1e2aae23472d692ce6314e8c683f950657d2 Mon Sep 17 00:00:00 2001 From: Tim Jaacks <tim.jaacks@seco.com> Date: Fri, 4 Aug 2023 15:30:51 +0200 Subject: [PATCH] ci-test: use more recent release for build simulation --- build-jobs-ci-test.yml.jinja2 | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/build-jobs-ci-test.yml.jinja2 b/build-jobs-ci-test.yml.jinja2 index a44d0d1c..37d0a98c 100644 --- a/build-jobs-ci-test.yml.jinja2 +++ b/build-jobs-ci-test.yml.jinja2 @@ -112,6 +112,11 @@ build:check-foo-branch: - echo "Getting Yocto build artifacts" - wget -O artifacts.zip ${BUILD_ARTIFACTS} - unzip artifacts.zip + cache: + - !reference [.buildbase, cache] + # Additionally cache the build artifacts for re-runs of this job in other pipelines + - key: ${CI_JOB_NAME}-${BUILD_ARTIFACTS} + paths: !reference [.buildbase, artifacts, paths] simulate-build-seco-mx6: extends: @@ -121,27 +126,17 @@ simulate-build-seco-mx6: # We have to specify a tag here instead of getting the artifacts from a master # branch, because we don't always execute the full pipeline on the master branches. # In those cases the actual build job does not exist, which results in a 404 error. - BUILD_ARTIFACTS: https://git.seco.com/seco-ne/yocto/manifest/-/jobs/artifacts/kirkstone/3.0/download?job=build-seco-mx6 + BUILD_ARTIFACTS: https://git.seco.com/seco-ne/yocto/manifest/-/jobs/artifacts/kirkstone/7.0/download?job=build-seco-mx6 ARTIFACTS_PATH: build-*/tmp/deploy/images/**/* - cache: - - !reference [.buildbase, cache] - # Additionally cache the build artifacts for re-runs of this job in other pipelines - - key: ${CI_JOB_NAME}-${BUILD_ARTIFACTS} - paths: !reference [.buildbase, artifacts, paths] simulate-buildsdk-seco-mx6: extends: - .simulate_build - .buildbase variables: - BUILD_ARTIFACTS: https://git.seco.com/seco-ne/yocto/manifest/-/jobs/artifacts/kirkstone/3.0/download?job=buildsdk-seco-mx6 + BUILD_ARTIFACTS: https://git.seco.com/seco-ne/yocto/manifest/-/jobs/artifacts/kirkstone/7.0/download?job=buildsdk-seco-mx6 ARTIFACTS_PATH: build-*/tmp/deploy/sdk/* MANUAL_BUILD: "true" - cache: - - !reference [.buildbase, cache] - # Additionally cache the build artifacts for re-runs of this job in other pipelines - - key: ${CI_JOB_NAME}-${BUILD_ARTIFACTS} - paths: !reference [.buildbase, artifacts, paths] # -------------------------------------------------------------------------------------- # Stage: Test -- GitLab