Edgex cleanup (#342)

* Remove all references to the Edgex provider from the docs * Remove the Edgex provider and its slot from the checkbox-core snaps * Remove the Edgex provider plug from the checkbox snaps (UC series only)
canonical · Mar 2, 2023 · 4a90be3 · 4a90be3
1 parent 43c9fab
commit 4a90be3
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 81 deletions.
diff --git a/README.md b/README.md
@@ -35,7 +35,6 @@ To get started, setup a test environment, run Checkbox and its providers, run th
     ├── certification-client
     ├── certification-server
     ├── docker
-    ├── edgex
     ├── gpgpu
     ├── iiotg
     ├── phoronix

diff --git a/checkbox-core-snap/series16/snap/snapcraft.yaml b/checkbox-core-snap/series16/snap/snapcraft.yaml
@@ -35,10 +35,6 @@ slots:
     interface: content
     read:
       - $SNAP/providers/checkbox-provider-sru
-  provider-edgex:
-    interface: content
-    read:
-      - $SNAP/providers/checkbox-provider-edgex
   provider-gpgpu:
     interface: content
     read:
@@ -312,20 +308,6 @@ parts:
       python3 manage.py build
       python3 manage.py install --layout=relocatable --prefix=/providers/checkbox-provider-sru --root="$SNAPCRAFT_PART_INSTALL"
     after: [checkbox-provider-tpm2]
-################################################################################
-  checkbox-provider-edgex:
-    plugin: dump
-    source: providers/edgex
-    source-type: local
-    override-build: |
-      export PYTHONPATH=$SNAPCRAFT_STAGE/lib/python3.8/site-packages:$SNAPCRAFT_STAGE/usr/lib/python3/dist-packages
-      for path in $(find "$SNAPCRAFT_STAGE/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-edgex --root="$SNAPCRAFT_PART_INSTALL"
-    stage-packages:
-      - curl
-    after: [checkbox-provider-sru]
 ################################################################################
   checkbox-provider-gpgpu:
     plugin: dump
@@ -337,7 +319,7 @@ parts:
       python3 manage.py validate
       python3 manage.py build
       python3 manage.py install --layout=relocatable --prefix=/providers/checkbox-provider-gpgpu --root="$SNAPCRAFT_PART_INSTALL"
-    after: [checkbox-provider-edgex]
+    after: [checkbox-provider-sru]
 ################################################################################
   checkbox-provider-certification-client:
     plugin: dump

diff --git a/checkbox-core-snap/series18/snap/snapcraft.yaml b/checkbox-core-snap/series18/snap/snapcraft.yaml
@@ -39,10 +39,6 @@ slots:
     interface: content
     read:
       - $SNAP/providers/checkbox-provider-sru
-  provider-edgex:
-    interface: content
-    read:
-      - $SNAP/providers/checkbox-provider-edgex
   provider-gpgpu:
     interface: content
     read:
@@ -311,20 +307,6 @@ parts:
       python3 manage.py build
       python3 manage.py install --layout=relocatable --prefix=/providers/checkbox-provider-sru --root="$SNAPCRAFT_PART_INSTALL"
     after: [checkbox-provider-tpm2, tpm2-tools-3]
-################################################################################
-  checkbox-provider-edgex:
-    plugin: dump
-    source: providers/edgex
-    source-type: local
-    override-build: |
-      export PYTHONPATH=$SNAPCRAFT_STAGE/lib/python3.8/site-packages:$SNAPCRAFT_STAGE/usr/lib/python3/dist-packages
-      for path in $(find "$SNAPCRAFT_STAGE/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-edgex --root="$SNAPCRAFT_PART_INSTALL"
-    stage-packages:
-      - curl
-    after: [checkbox-provider-sru]
 ################################################################################
   checkbox-provider-gpgpu:
     plugin: dump
@@ -336,7 +318,7 @@ parts:
       python3 manage.py validate
       python3 manage.py build
       python3 manage.py install --layout=relocatable --prefix=/providers/checkbox-provider-gpgpu --root="$SNAPCRAFT_PART_INSTALL"
-    after: [checkbox-provider-edgex]
+    after: [checkbox-provider-sru]
 ################################################################################
   checkbox-provider-certification-client:
     plugin: dump

diff --git a/checkbox-core-snap/series20/snap/snapcraft.yaml b/checkbox-core-snap/series20/snap/snapcraft.yaml
@@ -39,10 +39,6 @@ slots:
     interface: content
     read:
       - $SNAP/providers/checkbox-provider-sru
-  provider-edgex:
-    interface: content
-    read:
-      - $SNAP/providers/checkbox-provider-edgex
   provider-gpgpu:
     interface: content
     read:
@@ -375,20 +371,6 @@ parts:
       python3 manage.py build
       python3 manage.py install --layout=relocatable --prefix=/providers/checkbox-provider-sru --root="$SNAPCRAFT_PART_INSTALL"
     after: [checkbox-provider-iiotg]
-################################################################################
-  checkbox-provider-edgex:
-    plugin: dump
-    source: providers/edgex
-    source-type: local
-    override-build: |
-      export PYTHONPATH=$SNAPCRAFT_STAGE/lib/python3.8/site-packages:$SNAPCRAFT_STAGE/usr/lib/python3/dist-packages
-      for path in $(find "$SNAPCRAFT_STAGE/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-edgex --root="$SNAPCRAFT_PART_INSTALL"
-    stage-packages:
-      - curl
-    after: [checkbox-provider-sru]
 ################################################################################
   checkbox-provider-gpgpu:
     plugin: dump
@@ -400,7 +382,7 @@ parts:
       python3 manage.py validate
       python3 manage.py build
       python3 manage.py install --layout=relocatable --prefix=/providers/checkbox-provider-gpgpu --root="$SNAPCRAFT_PART_INSTALL"
-    after: [checkbox-provider-edgex]
+    after: [checkbox-provider-sru]
 ################################################################################
   checkbox-provider-certification-client:
     plugin: dump

diff --git a/checkbox-core-snap/series22/snap/snapcraft.yaml b/checkbox-core-snap/series22/snap/snapcraft.yaml
@@ -39,10 +39,6 @@ slots:
     interface: content
     read:
       - $SNAP/providers/checkbox-provider-sru
-  provider-edgex:
-    interface: content
-    read:
-      - $SNAP/providers/checkbox-provider-edgex
   provider-gpgpu:
     interface: content
     read:
@@ -375,20 +371,6 @@ parts:
       python3 manage.py build
       python3 manage.py install --layout=relocatable --prefix=/providers/checkbox-provider-sru --root="$SNAPCRAFT_PART_INSTALL"
     after: [checkbox-provider-iiotg]
-################################################################################
-  checkbox-provider-edgex:
-    plugin: dump
-    source: providers/edgex
-    source-type: local
-    override-build: |
-      export PYTHONPATH=$SNAPCRAFT_STAGE/lib/python3.10/site-packages:$SNAPCRAFT_STAGE/usr/lib/python3/dist-packages
-      for path in $(find "$SNAPCRAFT_STAGE/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-edgex --root="$SNAPCRAFT_PART_INSTALL"
-    stage-packages:
-      - curl
-    after: [checkbox-provider-sru]
 ################################################################################
   checkbox-provider-gpgpu:
     plugin: dump
@@ -400,7 +382,7 @@ parts:
       python3 manage.py validate
       python3 manage.py build
       python3 manage.py install --layout=relocatable --prefix=/providers/checkbox-provider-gpgpu --root="$SNAPCRAFT_PART_INSTALL"
-    after: [checkbox-provider-edgex]
+    after: [checkbox-provider-sru]
 ################################################################################
   checkbox-provider-certification-client:
     plugin: dump

diff --git a/checkbox-snap/series_uc20/launchers/configure b/checkbox-snap/series_uc20/launchers/configure
@@ -36,7 +36,6 @@ snap connect $SNAP_NAME:provider-checkbox checkbox20:provider-checkbox
 snap connect $SNAP_NAME:provider-docker   checkbox20:provider-docker
 snap connect $SNAP_NAME:provider-tpm2     checkbox20:provider-tpm2
 snap connect $SNAP_NAME:provider-sru      checkbox20:provider-sru
-snap connect $SNAP_NAME:provider-edgex    checkbox20:provider-edgex
     """
     print(os.path.expandvars(msg), file=sys.stderr)
     sys.exit(1)

diff --git a/checkbox-snap/series_uc20/snap/hooks/configure b/checkbox-snap/series_uc20/snap/hooks/configure
@@ -58,7 +58,6 @@ snap connect $SNAP_NAME:provider-checkbox checkbox20:provider-checkbox
 snap connect $SNAP_NAME:provider-docker   checkbox20:provider-docker
 snap connect $SNAP_NAME:provider-tpm2     checkbox20:provider-tpm2
 snap connect $SNAP_NAME:provider-sru      checkbox20:provider-sru
-snap connect $SNAP_NAME:provider-edgex    checkbox20:provider-edgex
 snap connect $SNAP_NAME:provider-certification-client  checkbox20:provider-certification-client
     """
     print(os.path.expandvars(msg), file=sys.stderr)

diff --git a/checkbox-snap/series_uc22/launchers/configure b/checkbox-snap/series_uc22/launchers/configure
@@ -36,7 +36,6 @@ snap connect $SNAP_NAME:provider-checkbox checkbox22:provider-checkbox
 snap connect $SNAP_NAME:provider-docker   checkbox22:provider-docker
 snap connect $SNAP_NAME:provider-tpm2     checkbox22:provider-tpm2
 snap connect $SNAP_NAME:provider-sru      checkbox22:provider-sru
-snap connect $SNAP_NAME:provider-edgex    checkbox22:provider-edgex
     """
     print(os.path.expandvars(msg), file=sys.stderr)
     sys.exit(1)

diff --git a/checkbox-snap/series_uc22/snap/hooks/configure b/checkbox-snap/series_uc22/snap/hooks/configure
@@ -58,7 +58,6 @@ snap connect $SNAP_NAME:provider-checkbox checkbox22:provider-checkbox
 snap connect $SNAP_NAME:provider-docker   checkbox22:provider-docker
 snap connect $SNAP_NAME:provider-tpm2     checkbox22:provider-tpm2
 snap connect $SNAP_NAME:provider-sru      checkbox22:provider-sru
-snap connect $SNAP_NAME:provider-edgex    checkbox22:provider-edgex
 snap connect $SNAP_NAME:provider-certification-client  checkbox22:provider-certification-client
     """
     print(os.path.expandvars(msg), file=sys.stderr)