From cc89ed44287988d44c8f113cc85258449c72eb23 Mon Sep 17 00:00:00 2001
From: Kristian Amlie <kristian.amlie@northern.tech>
Date: Fri, 13 Dec 2019 13:14:19 +0100
Subject: [PATCH 1/3] Add mender-image-tests as a submodule like in
 meta-mender.

This makes it a bit more explicit that it is part of the testing
files. It follows the same pattern as in meta-mender with pulling
automatically, and using `--no-pull` to disable it.

Changelog: None

Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>
---
 .gitignore                |  1 -
 .gitlab-ci.yml            |  7 +++++--
 .gitmodules               |  5 +++++
 scripts/test/run-tests.sh | 11 +++++------
 tests/mender-image-tests  |  1 +
 5 files changed, 16 insertions(+), 9 deletions(-)
 create mode 100644 .gitmodules
 create mode 160000 tests/mender-image-tests

diff --git a/.gitignore b/.gitignore
index 77a99bc..ef43e34 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,6 @@ deploy
 input
 work
 rootfs_overlay_demo/*
-tests
 mender_local_config
 *.xml
 *.html
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 210ced1..9e1dcd4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,7 @@ variables:
   MENDER_CLIENT_VERSION: master
   RASPBIAN_URL: http://downloads.raspberrypi.org/raspbian_lite/images/raspbian_lite-2019-09-30/2019-09-26-raspbian-buster-lite.zip
   RASPBIAN_NAME: 2019-09-26-raspbian-buster-lite
+  MENDER_IMAGE_TESTS_REV: master
 
   DEBIAN_FRONTEND: noninteractive
 
@@ -62,9 +63,11 @@ test_acceptance:
     - tar xzf deploy.tar.gz
     # Extract converted Raspbian artifacts
     - unxz deploy/raspberrypi-${RASPBIAN_NAME}-mender-${MENDER_CLIENT_VERSION}.sdimg.xz
+    # Set submodule to correct version
+    - ( cd tests/mender-image-tests && git submodule update --init --remote && git checkout origin/${MENDER_IMAGE_TESTS_REV} )
   script:
-    - ./scripts/test/run-tests.sh --prebuilt-image raspberrypi ${RASPBIAN_NAME}-mender-${MENDER_CLIENT_VERSION}
-    - ./scripts/test/run-tests.sh --all
+    - ./scripts/test/run-tests.sh --no-pull --prebuilt-image raspberrypi ${RASPBIAN_NAME}-mender-${MENDER_CLIENT_VERSION}
+    - ./scripts/test/run-tests.sh --no-pull --all
   artifacts:
     expire_in: 2w
     when: always
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..2631536
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,5 @@
+[submodule "tests/mender-image-tests"]
+	path = tests/mender-image-tests
+	url = https://github.com/mendersoftware/mender-image-tests
+	branch = master
+	ignore = all
diff --git a/scripts/test/run-tests.sh b/scripts/test/run-tests.sh
index 0f493f6..fec59c4 100755
--- a/scripts/test/run-tests.sh
+++ b/scripts/test/run-tests.sh
@@ -3,7 +3,7 @@
 set -e
 
 usage() {
-  echo "$0 <--all | --prebuilt-image DEVICE_TYPE IMAGE_NAME>"
+  echo "$0 [--no-pull] <--all | --prebuilt-image DEVICE_TYPE IMAGE_NAME>"
   exit 1
 }
 
@@ -37,12 +37,11 @@ source $UTILS_PATH
 # Some distros do not have /sbin in path for "normal users"
 export PATH="${PATH}:/sbin"
 
-if [ ! -d ${WORKSPACE}/mender-image-tests ]; then
-  git clone https://github.com/mendersoftware/mender-image-tests ${WORKSPACE}/mender-image-tests
+if [ "$1" = "--no-pull" ]; then
+  shift
 else
-  cd ${WORKSPACE}/mender-image-tests
-  git pull
-  cd -
+  echo "Automatically pulling submodules. Use --no-pull to disable"
+  git submodule update --init --remote
 fi
 
 mkdir -p ${WORKSPACE}
diff --git a/tests/mender-image-tests b/tests/mender-image-tests
new file mode 160000
index 0000000..f786ad5
--- /dev/null
+++ b/tests/mender-image-tests
@@ -0,0 +1 @@
+Subproject commit f786ad5d5e05f4e9e37667d58f12102ee9b7181c

From 5264138380e23efb7ee73e935ba91a69ed620664 Mon Sep 17 00:00:00 2001
From: Kristian Amlie <kristian.amlie@northern.tech>
Date: Fri, 13 Dec 2019 13:39:45 +0100
Subject: [PATCH 2/3] tests: Remove incorrect bitbake variable.

This variable is actually used to detect that we are building with
Yocto. With the mender-convert rewrite, the relevant section started
working in mender-convert as well, so remove this, and also remove the
check in mender-image-tests.

Changelog: None

Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>
---
 mender-convert-package | 1 -
 1 file changed, 1 deletion(-)

diff --git a/mender-convert-package b/mender-convert-package
index f52e668..180c834 100755
--- a/mender-convert-package
+++ b/mender-convert-package
@@ -307,5 +307,4 @@ EOF
 cat <<- EOF >> deploy/${image_name}.cfg
 IMAGE_FSTYPES="${image_fs_type} mender sdimg"
 ARTIFACTIMG_FSTYPE="${image_fs_type}"
-LAYER_CONF_VERSION="2"
 EOF

From ddb2667437d1ccfebeda3a11ea34c1a0ab8ea52f Mon Sep 17 00:00:00 2001
From: Kristian Amlie <kristian.amlie@northern.tech>
Date: Fri, 13 Dec 2019 14:30:18 +0100
Subject: [PATCH 3/3] tests: Add "mender-convert" to distro_features.

Makes it easier to detect that we are doing a mender-convert test
round.

Changelog: None

Signed-off-by: Kristian Amlie <kristian.amlie@northern.tech>
---
 mender-convert-package | 1 +
 1 file changed, 1 insertion(+)

diff --git a/mender-convert-package b/mender-convert-package
index 180c834..5649492 100755
--- a/mender-convert-package
+++ b/mender-convert-package
@@ -283,6 +283,7 @@ else
   # This is the name of the DISTRO_FEATURES in Yocto
   distro_feature="mender-uboot"
 fi
+distro_feature="${distro_feature} mender-convert"
 
 cat <<- EOF > deploy/${image_name}.cfg
 MENDER_BOOT_PART="${MENDER_STORAGE_DEVICE}${MENDER_BOOT_PART_INDEX}"