Merge pull request #10834 from sergiocazzolato/test-fix-netplan-2

tests: fix netplan test on i386 architecture
canonical · Sep 24, 2021 · 2629979 · 2629979
2 parents 5b73418 + 5b7c6d7
commit 2629979
Showing 1 changed file with 12 additions and 4 deletions.
diff --git a/tests/core/netplan/task.yaml b/tests/core/netplan/task.yaml
@@ -19,13 +19,21 @@ prepare: |
     sed "$TESTSLIB/snaps/netplan-snap/meta/snap.yaml.in" -e "s/base: BASESNAP/base: core18/" > "$TESTSLIB/snaps/netplan-snap/meta/snap.yaml"
     snap pack "$TESTSLIB/snaps/netplan-snap" --filename=netplan-snap-18.snap
 
-    # use base: core20
-    sed "$TESTSLIB/snaps/netplan-snap/meta/snap.yaml.in" -e "s/base: BASESNAP/base: core20/" > "$TESTSLIB/snaps/netplan-snap/meta/snap.yaml"
-    snap pack "$TESTSLIB/snaps/netplan-snap" --filename=netplan-snap-20.snap
+    # Skip i386 because core20 is not available for pc-i386 architecture
+    if not os.query is-pc-i386; then
+        # use base: core20
+        sed "$TESTSLIB/snaps/netplan-snap/meta/snap.yaml.in" -e "s/base: BASESNAP/base: core20/" > "$TESTSLIB/snaps/netplan-snap/meta/snap.yaml"
+        snap pack "$TESTSLIB/snaps/netplan-snap" --filename=netplan-snap-20.snap
+    fi
 
 execute: |
     # test all base versions of netplan on all combos of core releases
-    for rel in 16 18 20; do
+    versions="16 18 20"
+    # Skip i386 because core20 is not available for pc-i386 architecture
+    if os.query is-pc-i386; then
+        versions="16 18"
+    fi
+    for rel in $versions; do
         snap install --dangerous "netplan-snap-$rel.snap"
         echo "The interface is disconnected by default"
         snap connections netplan-snap | MATCH 'network-setup-control +netplan-snap:network-setup-control +- +-'