Fixup strict patch

canonical · Oct 30, 2023 · 7338298 · 7338298
1 parent 87a1693
commit 7338298
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 22 deletions.
diff --git a/build-scripts/patches/strict/0001-Strict.patch b/build-scripts/patches/strict/0001-Strict.patch
@@ -1,4 +1,4 @@
-From af92bae2020399d23bec3dced86eefa9b5fc0a26 Mon Sep 17 00:00:00 2001
+From 02a3a98b0cc8fd78e3da68e8aaeafbdaff7139fd Mon Sep 17 00:00:00 2001
 From: Konstantinos Tsakalozos <konstantinos.tsakalozos@canonical.com>
 Date: Tue, 8 Mar 2022 12:35:56 +0200
 Subject: [PATCH] Strict
@@ -16,8 +16,7 @@ Subject: [PATCH] Strict
  tests/libs/utils.sh                          |   1 +
  tests/smoke-test.sh                          |   4 +-
  tests/test-cluster.py                        |  18 +-
- tests/test-distro.sh                         |   2 +-
- 13 files changed, 547 insertions(+), 22 deletions(-)
+ 12 files changed, 546 insertions(+), 21 deletions(-)
  create mode 100755 microk8s-resources/connect-all-interfaces.sh
  create mode 100755 snap/hooks/connect-plug-configuration
  create mode 100755 snap/hooks/disconnect-plug-configuration
@@ -840,7 +839,7 @@ index 0c3b942..2c79188 100644
 
  # Channel we want to test. A full path to a local snap can be used for local builds
 -channel_to_test = os.environ.get("CHANNEL_TO_TEST", "latest/stable")
-+channel_to_test = os.environ.get("CHANNEL_TO_TEST", "latest/edge")
++channel_to_test = os.environ.get("CHANNEL_TO_TEST", "latest/edge/strict")
  backend = os.environ.get("BACKEND", None)
  profile = os.environ.get("LXC_PROFILE", "lxc/microk8s.profile")
  snap_data = os.environ.get("SNAP_DATA", "/var/snap/microk8s/current")
@@ -889,18 +888,5 @@ index 0c3b942..2c79188 100644
 
      def run(self, cmd):
          """
-diff --git a/tests/test-distro.sh b/tests/test-distro.sh
-index d804fc2..24ecc01 100755
---- a/tests/test-distro.sh
-+++ b/tests/test-distro.sh
-@@ -21,7 +21,7 @@ while true; do
-     --from-channel ) FROM_CHANNEL="$2"; shift 2 ;;
-     --to-channel ) TO_CHANNEL="$2"; shift 2 ;;
-     --proxy ) PROXY="$2"; shift 2 ;;
--    -h | --help )
-+    -h | --help )
-       prog=$(basename -s.wrapper "$0")
-       echo "Usage: $prog [options...] <distro> <from-channel> <to-channel> <proxy>"
-       echo "     --distro <distro> Distro image to be used for LXD containers Eg. ubuntu:18.04"
 --
-2.34.1
+2.25.1
diff --git a/tests/lxc/install-deps/images_debian-10 b/tests/lxc/install-deps/images_debian-10
@@ -24,4 +24,4 @@ do
   sudo snap install core20 && break  # substitute your command here
   n=$[$n+1]
   sleep 10
-done
+done
diff --git a/tests/lxc/install-deps/images_debian-11 b/tests/lxc/install-deps/images_debian-11
@@ -25,4 +25,4 @@ do
   sudo snap install core20 && break  # substitute your command here
   n=$[$n+1]
   sleep 10
-done
+done
diff --git a/tests/lxc/install-deps/images_debian-12 b/tests/lxc/install-deps/images_debian-12
@@ -16,4 +16,4 @@ do
   sudo snap install core20 && break  # substitute your command here
   n=$[$n+1]
   sleep 10
-done
+done
diff --git a/tests/test-distro.sh b/tests/test-distro.sh
@@ -21,7 +21,7 @@ while true; do
     --from-channel ) FROM_CHANNEL="$2"; shift 2 ;;
     --to-channel ) TO_CHANNEL="$2"; shift 2 ;;
     --proxy ) PROXY="$2"; shift 2 ;;
-    -h | --help ) 
+    -h | --help )
       prog=$(basename -s.wrapper "$0")
       echo "Usage: $prog [options...] <distro> <from-channel> <to-channel> <proxy>"
       echo "     --distro <distro> Distro image to be used for LXD containers Eg. ubuntu:18.04"