Skip to content
Snippets Groups Projects
Commit 0ef32ce7 authored by Tim Jaacks's avatar Tim Jaacks
Browse files

Update simulated build to kirkstone-14.0 

Remove temporary workarounds that were necessary due to changes after
the previously used release kirkstone-7.0.
parent 64dc51d3
No related branches found
No related tags found
1 merge request!342Update simulated build to kirkstone-14.0
Pipeline #82789 passed with stage
Stage:
    in 2 minutes and 56 seconds
    Hide whitespace changes
    Inline Side-by-side
    build-pipeline.yml
    + 0
    − 10
    View file @ 0ef32ce7
    ......@@ -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
    ......
    manifest-pipeline-ci-test.yml
    + 3
    − 3
    View file @ 0ef32ce7
    ......@@ -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
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment