From f2c9ce16719f3b000fbd34d8849e88648df0b4c9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 May 2021 13:50:02 +0000 Subject: [PATCH 1/2] Changelog:All: Bump tests/mender-image-tests from `a84e224` to `762ce89` Bumps [tests/mender-image-tests](https://github.com/mendersoftware/mender-image-tests) from `a84e224` to `762ce89`. - [Release notes](https://github.com/mendersoftware/mender-image-tests/releases) - [Commits](https://github.com/mendersoftware/mender-image-tests/compare/a84e22451c4401d9dfcbb9d04f0ff5aa9b2cca78...762ce89b764bf67db647827f8eb7923b707fc2fe) Signed-off-by: dependabot[bot] --- tests/mender-image-tests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/mender-image-tests b/tests/mender-image-tests index a84e224..762ce89 160000 --- a/tests/mender-image-tests +++ b/tests/mender-image-tests @@ -1 +1 @@ -Subproject commit a84e22451c4401d9dfcbb9d04f0ff5aa9b2cca78 +Subproject commit 762ce89b764bf67db647827f8eb7923b707fc2fe From 1caf9e8eb85ac08e3ee462a01005fa166a8bfdea Mon Sep 17 00:00:00 2001 From: Lluis Campos Date: Thu, 6 May 2021 13:11:13 +0200 Subject: [PATCH 2/2] [pipeline] Install Update Modules Artifact generator for tests Required for the new tests in mender-image-tests submodule Changelog: None Signed-off-by: Lluis Campos --- .gitlab-ci.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3bb622d..0be967d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -180,6 +180,18 @@ convert_raspbian_raspberrypi4: - curl -f -O https://mender.s3.amazonaws.com/mender-artifact/$MENDER_ARTIFACT_VERSION/linux/mender-artifact - chmod ugo+x mender-artifact - mv mender-artifact /usr/bin/ + # Get Update Modules Artifact generators for the tests + - if [ "${MENDER_CLIENT_VERSION}" = "latest" ]; then + - mender_version=master + - else + - mender_version="${MENDER_CLIENT_VERSION}" + - fi + - curl -f -O https://raw.githubusercontent.com/mendersoftware/mender/${mender_version}/support/modules-artifact-gen/directory-artifact-gen + - chmod ugo+x directory-artifact-gen + - mv directory-artifact-gen /usr/bin/ + - curl -f -O https://raw.githubusercontent.com/mendersoftware/mender/${mender_version}/support/modules-artifact-gen/single-file-artifact-gen + - chmod ugo+x single-file-artifact-gen + - mv single-file-artifact-gen /usr/bin/ artifacts: expire_in: 2w when: always