From 2bfba9106a29981af6beb123bbeb460fab3c17b9 Mon Sep 17 00:00:00 2001
From: Minecrell <minecrell@minecrell.net>
Date: Sat, 14 Mar 2020 09:30:58 +0100
Subject: [PATCH] CI: update for device/* -> device/testing/* move (!1067)

---
 .gitlab-ci.yml                              | 4 ++--
 .gitlab-ci/check_changed_aports_versions.py | 4 ++--
 .gitlab-ci/check_devices_in_wiki.py         | 2 +-
 .gitlab-ci/common.py                        | 3 ++-
 .gitlab-ci/testcases/test_aports.py         | 8 ++++----
 5 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 049cd1b49..126cca952 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,7 +30,7 @@ wiki:
     refs:
       - merge_requests
     changes:
-      - device/device-*/*
+      - device/*/device-*/*
   before_script:
     - apk -q add python3
   script:
@@ -99,7 +99,7 @@ kernel-kconfig:
       - master
       - merge_requests
     changes:
-      - device/linux-*/config-*
+      - device/*/linux-*/config-*
       - main/linux-*/config-*
   before_script:
     - .gitlab-ci/install_pmbootstrap.sh pytest
diff --git a/.gitlab-ci/check_changed_aports_versions.py b/.gitlab-ci/check_changed_aports_versions.py
index ae1bc0fb9..cd3fe7c58 100755
--- a/.gitlab-ci/check_changed_aports_versions.py
+++ b/.gitlab-ci/check_changed_aports_versions.py
@@ -26,8 +26,8 @@ def get_package_version(args, package, revision, check=True):
 
     # Run something like "git show upstream/master:main/hello-world/APKBUILD"
     pmaports_dir = common.get_pmaports_dir()
-    pattern = pmaports_dir + "/*/" + package + "/APKBUILD"
-    path = glob.glob(pattern)[0][len(pmaports_dir + "/"):]
+    pattern = pmaports_dir + "/**/" + package + "/APKBUILD"
+    path = glob.glob(pattern, recursive=True)[0][len(pmaports_dir + "/"):]
     apkbuild_content = common.run_git(["show", revision + ":" + path], check,
                                       stderr)
     if not apkbuild_content:
diff --git a/.gitlab-ci/check_devices_in_wiki.py b/.gitlab-ci/check_devices_in_wiki.py
index 550bb9153..dc516ecae 100755
--- a/.gitlab-ci/check_devices_in_wiki.py
+++ b/.gitlab-ci/check_devices_in_wiki.py
@@ -14,7 +14,7 @@ def get_devices():
     ret = []
     pmaports = (os.path.realpath(os.path.join(os.path.dirname(__file__) +
                 "/..")))
-    for path in glob.glob(pmaports + "/device/device-*/"):
+    for path in glob.glob(pmaports + "/device/*/device-*/"):
         device = os.path.dirname(path).split("device-", 1)[1]
         ret.append(device)
     return sorted(ret)
diff --git a/.gitlab-ci/common.py b/.gitlab-ci/common.py
index d0cd62d5f..7acb03acd 100755
--- a/.gitlab-ci/common.py
+++ b/.gitlab-ci/common.py
@@ -123,7 +123,8 @@ def get_changed_packages(with_directory=False):
         if with_directory:
             ret.add(file)
         else:
-            ret.add(file.split("/")[1])
+            # device/testing/device-something/APKBUILD -> device-something
+            ret.add(file.split("/")[-2])
     return ret
 
 
diff --git a/.gitlab-ci/testcases/test_aports.py b/.gitlab-ci/testcases/test_aports.py
index 35e569e5c..33b8e537f 100644
--- a/.gitlab-ci/testcases/test_aports.py
+++ b/.gitlab-ci/testcases/test_aports.py
@@ -47,7 +47,7 @@ def test_deviceinfo(args):
     # Iterate over all devices
     last_exception = None
     count = 0
-    for folder in glob.glob(args.aports + "/device/device-*"):
+    for folder in glob.glob(args.aports + "/device/*/device-*"):
         device = folder[len(args.aports):].split("-", 1)[1]
 
         try:
@@ -98,9 +98,9 @@ def device_dependency_check(apkbuild, path):
 
 def test_aports_device(args):
     """
-    Various tests performed on the /device/device-* aports.
+    Various tests performed on the /device/*/device-* aports.
     """
-    for path in glob.glob(args.aports + "/device/device-*/APKBUILD"):
+    for path in glob.glob(args.aports + "/device/*/device-*/APKBUILD"):
         apkbuild = pmb.parse.apkbuild(args, path)
 
         # Depends: Require "postmarketos-base"
@@ -130,7 +130,7 @@ def test_aports_device_kernel(args):
     """
 
     # Iterate over device aports
-    for path in glob.glob(args.aports + "/device/device-*/APKBUILD"):
+    for path in glob.glob(args.aports + "/device/*/device-*/APKBUILD"):
         # Parse apkbuild and kernels from subpackages
         apkbuild = pmb.parse.apkbuild(args, path)
         device = apkbuild["pkgname"][len("device-"):]