diff --git a/build-pipeline.yml b/build-pipeline.yml index 0a286a51b8e50e52bf49c35f053af67a21f60757..e63969689f05515b93c559d67bbaf1b0cb7c6356 100644 --- a/build-pipeline.yml +++ b/build-pipeline.yml @@ -264,16 +264,6 @@ workflow: - echo "Getting Yocto build artifacts" - wget -O artifacts.zip ${BUILD_ARTIFACTS} - unzip artifacts.zip - after_script: - # FIXME: This is necessary because we're using an old build for the build simulation - # which does not export these variables, yet. Can be removed as soon as we switch to - # a newer release already containing these variables, then they can be read from the - # existing build.env from the cache. - # yamllint disable-line rule:line-length - - export TOOLCHAIN_OUTPUTNAME="seconorth-wayland-glibc-x86_64-seconorth-image-cortexa9t2hf-neon-$MACHINE-toolchain-kirkstone-7.0" - # yamllint disable-line rule:line-length - - export DISTRO_RELEASE_ARTEFACTS="seconorth-image-$MACHINE.tar.gz seconorth-image-$MACHINE.manifest seconorth-image-$MACHINE.testdata.json fng-install.sh pkg.py" - - *save_build_env cache: - *cache # Additionally cache the build artifacts for re-runs of this job in other pipelines diff --git a/manifest-pipeline-ci-test.yml b/manifest-pipeline-ci-test.yml index f85e47ab43358bea6fa2103065a9497e8756c07b..764dde86d7d91bf361989d9f7f7d8374f2b75ff0 100644 --- a/manifest-pipeline-ci-test.yml +++ b/manifest-pipeline-ci-test.yml @@ -63,12 +63,12 @@ yocto-simulation-pipeline: - .yocto-deploy variables: BUILD_ARTIFACTS_PREFIX: >- - https://git.seco.com/seco-ne/yocto/manifest/-/jobs/artifacts/kirkstone/7.0/download?job=build + https://git.seco.com/seco-ne/yocto/manifest/-/jobs/artifacts/kirkstone/14.0/download?job=build YOCTO_IMAGE: seconorth-image YOCTO_DISTRO: seconorth-wayland SETUP_SCRIPT: /dev/null INSTALL_SCRIPT: fng-install.sh - BITBAKE_ENV_COMMAND: echo DISTRO_VERSION="kirkstone-7.0" + BITBAKE_ENV_COMMAND: echo DISTRO_VERSION="kirkstone-14.0" ARTIFACTS_PATH: build-*/tmp/deploy/images/**/* PACKAGE_TYPE: image TEST_STAGE: "true" @@ -85,7 +85,7 @@ sdk-simulation-pipeline: - .yocto-deploy variables: BUILD_ARTIFACTS_PREFIX: >- - https://git.seco.com/seco-ne/yocto/manifest/-/jobs/artifacts/kirkstone/7.0/download?job=buildsdk + https://git.seco.com/seco-ne/yocto/manifest/-/jobs/artifacts/kirkstone/14.0/download?job=buildsdk YOCTO_IMAGE: seconorth-image YOCTO_DISTRO: seconorth-wayland SETUP_SCRIPT: /dev/null