From 7293304845d774966b3bd27a1e57037c41b347df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
Date: Wed, 19 Jul 2023 13:30:22 +0200
Subject: [PATCH] profiles,ci: sunset webui profile
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Historically prplOS web user interface was based on uhttpd/LuCI so it
made sense to keep this feature in separate webui.yml profile, but
nowadays the same feature is provided by single `prpl-webui` package and
thus it doesn't make sense anymore to maintain separate profile for that
package, so lets simply move `prpl-webui` package into prpl.yml profile.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
---
 .gitlab-ci.yml                    | 10 +++++-----
 .gitlab/README.md                 |  4 ++--
 .gitlab/cdrouter/glinet-b1300.yml |  2 +-
 .gitlab/cdrouter/prpl-haze.yml    |  2 +-
 .gitlab/cdrouter/turris-omnia.yml |  2 +-
 .gitlab/docker/sdk/gitlab.yml     |  6 +++---
 profiles/prpl.yml                 |  3 ++-
 profiles/webui.yml                | 10 ----------
 8 files changed, 15 insertions(+), 24 deletions(-)
 delete mode 100644 profiles/webui.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e61c3074cd..a91b62a50f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -27,26 +27,26 @@ stages:
   - cdrouter
   - coverity
 
-build test mvebu prpl webui:
+build test mvebu prpl:
   extends: .build test config
 
-build test x86_64 prpl webui:
+build test x86_64 prpl:
   extends: .build test config
   variables:
     CI_BUILD_CONFIG: >
       +DEVEL +BUILD_LOG +SDK +IB +IB_STANDALONE
 
-build test ipq807x prpl webui:
+build test ipq807x prpl:
   extends: .build test config
 
 run test Turris Omnia initramfs:
   needs:
-    - job: build test mvebu prpl webui
+    - job: build test mvebu prpl
       optional: true
   extends: .turris-omnia testbed
 
 run test Haze initramfs:
   needs:
-    - job: build test ipq807x prpl webui
+    - job: build test ipq807x prpl
       optional: true
   extends: .prpl-haze testbed
diff --git a/.gitlab/README.md b/.gitlab/README.md
index 1c0a182d70..e54bcb700d 100644
--- a/.gitlab/README.md
+++ b/.gitlab/README.md
@@ -35,11 +35,11 @@ include:
 stages:
  - build
 
-build test netgear-rax40 prpl webui:
+build test netgear-rax40 prpl:
   extends: .build test config
 ```
 
-Which is going to build test prplOS with `netgear-rax40`, `prpl` and `webui` profiles.
+Which is going to build test prplOS with `netgear-rax40` and `prpl` profiles.
 
 Description of CI variables:
 
diff --git a/.gitlab/cdrouter/glinet-b1300.yml b/.gitlab/cdrouter/glinet-b1300.yml
index 0dcee3fa2a..9f01c44873 100644
--- a/.gitlab/cdrouter/glinet-b1300.yml
+++ b/.gitlab/cdrouter/glinet-b1300.yml
@@ -1,6 +1,6 @@
 .glinet-cdrouter: &glinet_cdrouter
   needs:
-    - job: build test ipq40xx prpl webui
+    - job: build test ipq40xx prpl
       optional: true
   extends:
     - .glinet-b1300 testbed
diff --git a/.gitlab/cdrouter/prpl-haze.yml b/.gitlab/cdrouter/prpl-haze.yml
index c339ae3c52..507639828e 100644
--- a/.gitlab/cdrouter/prpl-haze.yml
+++ b/.gitlab/cdrouter/prpl-haze.yml
@@ -1,6 +1,6 @@
 .prpl-haze: &prpl_haze
   needs:
-    - job: build test ipq807x prpl webui
+    - job: build test ipq807x prpl
       optional: true
   extends:
     - .prpl-haze testbed
diff --git a/.gitlab/cdrouter/turris-omnia.yml b/.gitlab/cdrouter/turris-omnia.yml
index d114860f14..83bfdf4b8f 100644
--- a/.gitlab/cdrouter/turris-omnia.yml
+++ b/.gitlab/cdrouter/turris-omnia.yml
@@ -1,6 +1,6 @@
 .turris-cdrouter: &turris_cdrouter
   needs:
-    - job: build test mvebu prpl webui
+    - job: build test mvebu prpl
       optional: true
   extends:
     - .turris-omnia testbed
diff --git a/.gitlab/docker/sdk/gitlab.yml b/.gitlab/docker/sdk/gitlab.yml
index a2c10220a0..867146abc5 100644
--- a/.gitlab/docker/sdk/gitlab.yml
+++ b/.gitlab/docker/sdk/gitlab.yml
@@ -1,6 +1,6 @@
 build Docker image sdk-mvebu-cortexa9:
   stage: docker SDK
-  needs: ["build test mvebu prpl webui"]
+  needs: ["build test mvebu prpl"]
   variables:
     DOCKER_DOCKERFILE_PATH: .gitlab/docker/sdk
     DOCKER_BUILD_EXTRA_ARGS: --build-arg DESIGNATED_BRANCH=$CI_DESIGNATED_BRANCH
@@ -20,7 +20,7 @@ deploy Docker image sdk-mvebu-cortexa9:
 
 build Docker image sdk-x86-64:
   stage: docker SDK
-  needs: ["build test x86_64 prpl webui"]
+  needs: ["build test x86_64 prpl"]
   variables:
     DOCKER_DOCKERFILE_PATH: .gitlab/docker/sdk
     DOCKER_BUILD_EXTRA_ARGS: --build-arg DESIGNATED_BRANCH=$CI_DESIGNATED_BRANCH
@@ -40,7 +40,7 @@ deploy Docker image sdk-x86-64:
 
 build Docker image sdk-ipq807x-generic:
   stage: docker SDK
-  needs: ["build test ipq807x prpl webui"]
+  needs: ["build test ipq807x prpl"]
   variables:
     DOCKER_DOCKERFILE_PATH: .gitlab/docker/sdk
     DOCKER_BUILD_EXTRA_ARGS: --build-arg DESIGNATED_BRANCH=$CI_DESIGNATED_BRANCH
diff --git a/profiles/prpl.yml b/profiles/prpl.yml
index a1a850ae4f..496181edaf 100644
--- a/profiles/prpl.yml
+++ b/profiles/prpl.yml
@@ -105,10 +105,11 @@ packages:
   - odl-generator
   - packet-interception
   - pcm-manager
-  - prplmesh
   - procps-ng-pgrep
   - procps-ng-pkill
   - procps-ng-uptime
+  - prpl-webui
+  - prplmesh
   - rlyeh
   - routing-manager
   - ssh-server
diff --git a/profiles/webui.yml b/profiles/webui.yml
deleted file mode 100644
index be8fc16e16..0000000000
--- a/profiles/webui.yml
+++ /dev/null
@@ -1,10 +0,0 @@
----
-description: Add the prpl WebUI
-feeds:
-  - name: feed_prpl
-    uri: https://gitlab.com/prpl-foundation/prplOS/feed-prpl.git
-    tracking_branch: prplos-next
-    revision: 294a2c2c723a9729a45efa0d67ef064c91fcea1c
-
-packages:
-  - prpl-webui