Merge pull request #2709 from reubenmiller/issue-2698-remove-deprecat…

…ed-plugins

chore: remove deprecated and unused plugins

Cargo.toml

@@ -4,13 +4,9 @@ members = [
     "crates/core/*",
     "crates/extensions/*",
     "crates/tests/*",
-    "plugins/c8y_configuration_plugin",
     "plugins/c8y_firmware_plugin",
-    "plugins/c8y_log_plugin",
     "plugins/c8y_remote_access_plugin",
     "plugins/tedge_apt_plugin",
-    "plugins/tedge_configuration_plugin",
-    "plugins/tedge_log_plugin",
 ]
 resolver = "2"
 
@@ -45,15 +41,12 @@ backoff = { version = "0.4", features = ["tokio"] }
 base64 = "0.13"
 batcher = { path = "crates/common/batcher" }
 bytes = "1.4"
-c8y-configuration-plugin = { path = "plugins/c8y_configuration_plugin" }
 c8y-firmware-plugin = { path = "plugins/c8y_firmware_plugin" }
 c8y-remote-access-plugin = { path = "plugins/c8y_remote_access_plugin" }
 c8y_api = { path = "crates/core/c8y_api" }
 c8y_auth_proxy = { path = "crates/extensions/c8y_auth_proxy" }
-c8y_config_manager = { path = "crates/extensions/c8y_config_manager" }
 c8y_firmware_manager = { path = "crates/extensions/c8y_firmware_manager" }
 c8y_http_proxy = { path = "crates/extensions/c8y_http_proxy" }
-c8y_log_manager = { path = "crates/extensions/c8y_log_manager" }
 c8y_mapper_ext = { path = "crates/extensions/c8y_mapper_ext" }
 camino = "1.1"
 cap = "0.1"
@@ -137,8 +130,6 @@ strum_macros = "0.24"
 syn = { version = "2", features = ["full", "extra-traits"] }
 tedge-agent = { path = "crates/core/tedge_agent" }
 tedge-apt-plugin = { path = "plugins/tedge_apt_plugin" }
-tedge-configuration-plugin = { path = "plugins/tedge_configuration_plugin" }
-tedge-log-plugin = { path = "plugins/tedge_log_plugin" }
 tedge-mapper = { path = "crates/core/tedge_mapper" }
 tedge-watchdog = { path = "crates/core/tedge_watchdog" }
 tedge-write = { path = "crates/core/tedge_write" }

ci/build_scripts/build.sh

@@ -80,8 +80,7 @@ ARCH=
 TARGET=()
 BUILD_OPTIONS=()
 BUILD=1
-INCLUDE_TEST_PACKAGES=1
-INCLUDE_DEPRECATED_PACKAGES=1
+INCLUDE_DEPRECATED_PACKAGES=0
 
 REST_ARGS=()
 while [ $# -gt 0 ]
@@ -91,10 +90,9 @@ do
             BUILD=0
             ;;
 
-        --skip-test-packages)
-            INCLUDE_TEST_PACKAGES=0
+        --include-deprecated-packages)
+            INCLUDE_DEPRECATED_PACKAGES=1
             ;;
-
         --skip-deprecated-packages)
             INCLUDE_DEPRECATED_PACKAGES=0
             ;;
@@ -150,7 +148,7 @@ if [ -z "$ARCH" ]; then
 fi
 
 
-# Load the release package list as $RELEASE_PACKAGES, $DEPRECATED_PACKAGES and $TEST_PACKAGES
+# Load the release package list as $RELEASE_PACKAGES, $DEPRECATED_PACKAGES
 # shellcheck disable=SC1091
 source ./ci/package_list.sh
 
@@ -209,16 +207,3 @@ if [ "$INCLUDE_DEPRECATED_PACKAGES" = "1" ]; then
 fi
 
 ./ci/build_scripts/package.sh build "$ARCH" "${PACKAGES[@]}" --output "$OUTPUT_DIR"
-
-if [ "$INCLUDE_TEST_PACKAGES" = 1 ]; then
-    if [ "$BUILD" = 1 ]; then
-        # Strip and build for test artifacts
-        for PACKAGE in "${TEST_PACKAGES[@]}"
-        do
-            cargo zigbuild --release -p "$PACKAGE" "${TARGET[@]}"
-        done
-    fi
-
-    # Package test binaries (deb only)
-    ./ci/build_scripts/package.sh build "$ARCH" "${TEST_PACKAGES[@]}" --types deb --output "$OUTPUT_DIR" --no-clean
-fi

ci/package_list.sh

@@ -15,29 +15,5 @@ export RELEASE_PACKAGES
 # Deprecated packages are still built but not explicitly tested
 # This allows users to still access the packages if needed, however
 # it is only reserved for packages with a more public facing API
-DEPRECATED_PACKAGES=(
-    c8y-configuration-plugin
-)
+DEPRECATED_PACKAGES=()
 export DEPRECATED_PACKAGES
-
-TEST_PACKAGES=(
-    sawtooth-publisher
-)
-export TEST_PACKAGES
-
-EXTERNAL_ARM_PACKAGES=(
-    mosquitto-clients
-    mosquitto
-    libmosquitto1
-    collectd-core
-    collectd
-)
-export EXTERNAL_ARM_PACKAGES
-
-EXTERNAL_AMD64_PACKAGES=(
-    mosquitto
-    libmosquitto1
-    collectd-core
-)
-export EXTERNAL_AMD64_PACKAGES
-

configuration/package_scripts/README.md

@@ -103,19 +103,12 @@ Below shows the general workflow to editing an existing maintainer script for th
     ```
 
     ```text
-    -rw-r--r--@ 1 developer  staff   2810413 Aug  8 11:47 c8y-configuration-plugin-0.11.1~340+g1441e71d.aarch64.rpm
-    -rw-r--r--@ 1 developer  staff   2804483 Aug  8 11:47 c8y-configuration-plugin_0.11.1~340+g1441e71d_aarch64.apk
-    -rw-r--r--@ 1 developer  staff   2248562 Aug  8 11:47 c8y-configuration-plugin_0.11.1~340+g1441e71d_arm64.deb
     -rw-r--r--@ 1 developer  staff   2506444 Aug  8 11:47 c8y-firmware-plugin-0.11.1~340+g1441e71d.aarch64.rpm
     -rw-r--r--@ 1 developer  staff   2490272 Aug  8 11:47 c8y-firmware-plugin_0.11.1~340+g1441e71d_aarch64.apk
     -rw-r--r--@ 1 developer  staff   2018558 Aug  8 11:47 c8y-firmware-plugin_0.11.1~340+g1441e71d_arm64.deb
-    -rw-r--r--@ 1 developer  staff   2794275 Aug  8 11:47 c8y-log-plugin-0.11.1~340+g1441e71d.aarch64.rpm
-    -rw-r--r--@ 1 developer  staff   2789684 Aug  8 11:47 c8y-log-plugin_0.11.1~340+g1441e71d_aarch64.apk
-    -rw-r--r--@ 1 developer  staff   2223752 Aug  8 11:47 c8y-log-plugin_0.11.1~340+g1441e71d_arm64.deb
     -rw-r--r--@ 1 developer  staff   1735095 Aug  8 11:47 c8y-remote-access-plugin-0.11.1~340+g1441e71d.aarch64.rpm
     -rw-r--r--@ 1 developer  staff   1737980 Aug  8 11:47 c8y-remote-access-plugin_0.11.1~340+g1441e71d_aarch64.apk
     -rw-r--r--@ 1 developer  staff   1413456 Aug  8 11:47 c8y-remote-access-plugin_0.11.1~340+g1441e71d_arm64.deb
-    -rw-r--r--@ 1 developer  staff   1285994 Aug  8 11:47 sawtooth-publisher_0.11.1~340+g1441e71d_arm64.deb
     -rw-r--r--@ 1 developer  staff   2463953 Aug  8 11:47 tedge-0.11.1~340+g1441e71d.aarch64.rpm
     -rw-r--r--@ 1 developer  staff   2862011 Aug  8 11:47 tedge-agent-0.11.1~340+g1441e71d.aarch64.rpm
     -rw-r--r--@ 1 developer  staff   2865115 Aug  8 11:47 tedge-agent_0.11.1~340+g1441e71d_aarch64.apk