[checkbox-ce-oem] Add interface for docker provider for uc and checkb…

…ox24 for series 24 building (Bugfix) (#1672) * Add back build snap and default-provider for checkbox24 in series 24 * Add docker provider interface for uc testing * Rename from plainbox to checkbox
canonical · Dec 25, 2024 · d0c75fb · d0c75fb
1 parent 21cd1c6
commit d0c75fb
Show file tree

Hide file tree

Showing 4 changed files with 33 additions and 25 deletions.
diff --git a/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic24/snap/snapcraft.yaml b/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_classic24/snap/snapcraft.yaml
@@ -49,15 +49,13 @@ parts:
       craftctl default
       rm lib/systemd/system/alsa-utils.service
     override-build: |
-      sudo snap install checkbox24 --edge  #TODO: Remove this line when checkbox24 is released in stable channel
       export PYTHONPATH=/snap/checkbox24/current/lib/python3.12/site-packages/
       for path in $(find "/snap/checkbox24/current/providers/" -mindepth 1 -maxdepth 1 -type d); do export PROVIDERPATH=$path${PROVIDERPATH:+:$PROVIDERPATH}; done
       python3 manage.py validate
       python3 manage.py build
       python3 manage.py install --layout=relocatable --prefix=/providers/checkbox-provider-ce-oem --root="$CRAFT_PART_INSTALL"
-    #TODO: Remove the comments when checkbox24 is released in stable channel
-    # build-snaps:
-    #   - checkbox24
+    build-snaps:
+      - checkbox24
     build-packages:
       - python3-dev
       - python3-jinja2

diff --git a/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_uc20/snap/snapcraft.yaml b/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_uc20/snap/snapcraft.yaml
@@ -15,19 +15,23 @@ plugs:
     default-provider: checkbox20
   provider-resource:
     interface: content
-    target: $SNAP/providers/plainbox-provider-resource
+    target: $SNAP/providers/checkbox-provider-resource
     default-provider: checkbox20
   provider-checkbox:
     interface: content
-    target: $SNAP/providers/plainbox-provider-checkbox
+    target: $SNAP/providers/checkbox-provider-checkbox
     default-provider: checkbox20
   provider-tpm2:
     interface: content
-    target: $SNAP/providers/plainbox-provider-tpm2
+    target: $SNAP/providers/checkbox-provider-tpm2
+    default-provider: checkbox20
+  provider-docker:
+    interface: content
+    target: $SNAP/providers/checkbox-provider-docker
     default-provider: checkbox20
   provider-certification-client:
     interface: content
-    target: $SNAP/providers/plainbox-provider-certification-client
+    target: $SNAP/providers/checkbox-provider-certification-client
     default-provider: checkbox20
 apps:
   checkbox-cli:

diff --git a/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_uc22/snap/snapcraft.yaml b/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_uc22/snap/snapcraft.yaml
@@ -15,19 +15,23 @@ plugs:
     default-provider: checkbox22
   provider-resource:
     interface: content
-    target: $SNAP/providers/plainbox-provider-resource
+    target: $SNAP/providers/checkbox-provider-resource
     default-provider: checkbox22
   provider-checkbox:
     interface: content
-    target: $SNAP/providers/plainbox-provider-checkbox
+    target: $SNAP/providers/checkbox-provider-checkbox
     default-provider: checkbox22
   provider-tpm2:
     interface: content
-    target: $SNAP/providers/plainbox-provider-tpm2
+    target: $SNAP/providers/checkbox-provider-tpm2
+    default-provider: checkbox22
+  provider-docker:
+    interface: content
+    target: $SNAP/providers/checkbox-provider-docker
     default-provider: checkbox22
   provider-certification-client:
     interface: content
-    target: $SNAP/providers/plainbox-provider-certification-client
+    target: $SNAP/providers/checkbox-provider-certification-client
     default-provider: checkbox22
 apps:
   checkbox-cli:

diff --git a/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_uc24/snap/snapcraft.yaml b/contrib/checkbox-ce-oem/checkbox-ce-oem-snap/series_uc24/snap/snapcraft.yaml
@@ -12,23 +12,27 @@ plugs:
   checkbox-runtime:
     interface: content
     target: $SNAP/checkbox-runtime
-    # default-provider: checkbox24  #TODO: Remove the comments when checkbox24 is released in stable channel
+    default-provider: checkbox24
   provider-resource:
     interface: content
-    target: $SNAP/providers/plainbox-provider-resource
-    # default-provider: checkbox24  #TODO: Remove the comments when checkbox24 is released in stable channel
+    target: $SNAP/providers/checkbox-provider-resource
+    default-provider: checkbox24
   provider-checkbox:
     interface: content
-    target: $SNAP/providers/plainbox-provider-checkbox
-    # default-provider: checkbox24  #TODO: Remove the comments when checkbox24 is released in stable channel
+    target: $SNAP/providers/checkbox-provider-checkbox
+    default-provider: checkbox24
   provider-tpm2:
     interface: content
-    target: $SNAP/providers/plainbox-provider-tpm2
-    # default-provider: checkbox24  #TODO: Remove the comments when checkbox24 is released in stable channel
+    target: $SNAP/providers/checkbox-provider-tpm2
+    default-provider: checkbox24
+  provider-docker:
+    interface: content
+    target: $SNAP/providers/checkbox-provider-docker
+    default-provider: checkbox24
   provider-certification-client:
     interface: content
-    target: $SNAP/providers/plainbox-provider-certification-client
-    # default-provider: checkbox24  #TODO: Remove the comments when checkbox24 is released in stable channel
+    target: $SNAP/providers/checkbox-provider-certification-client
+    default-provider: checkbox24
 apps:
   checkbox-cli:
     command-chain: [bin/wrapper_local]
@@ -82,15 +86,13 @@ parts:
       craftctl default
       rm lib/systemd/system/alsa-utils.service
     override-build: |
-      sudo snap install checkbox24 --edge  #TODO: Remove this line when checkbox24 is released in stable channel
       export PYTHONPATH=/snap/checkbox24/current/lib/python3.12/site-packages/
       for path in $(find "/snap/checkbox24/current/providers/" -mindepth 1 -maxdepth 1 -type d); do export PROVIDERPATH=$path${PROVIDERPATH:+:$PROVIDERPATH}; done
       python3 manage.py validate
       python3 manage.py build
       python3 manage.py install --layout=relocatable --prefix=/providers/checkbox-provider-ce-oem --root="$CRAFT_PART_INSTALL"
-    #TODO: Remove the comments when checkbox24 is released in stable channel
-    # build-snaps:
-    #   - checkbox24
+    build-snaps:
+      - checkbox24
     build-packages:
       - python3-dev
       - python3-jinja2