From d264d96f7dd235fcdd759d3ef1747a50f09f820f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20=C5=A0tetiar?= <ynezz@true.cz>
Date: Fri, 29 Sep 2023 16:13:10 +0000
Subject: [PATCH] ci: switch from prplos-next branch to prplos branch
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We've moved development from prplos-next into prplos.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
---
 .gitlab-ci.yml                |  2 +-
 .gitlab/docker/sdk/Dockerfile |  3 +--
 .gitlab/sdk.yml               | 31 ++++++++++++++++++++-----------
 3 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index adcb32745d..c7ebe58eef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  CI_DESIGNATED_BRANCH: prplos-next
+  CI_DESIGNATED_BRANCH: prplos
 
 include:
   - local: .gitlab/build.yml
diff --git a/.gitlab/docker/sdk/Dockerfile b/.gitlab/docker/sdk/Dockerfile
index 4c8d707b7b..1cca90c217 100644
--- a/.gitlab/docker/sdk/Dockerfile
+++ b/.gitlab/docker/sdk/Dockerfile
@@ -1,4 +1,4 @@
-ARG DESIGNATED_BRANCH=prplos-next
+ARG DESIGNATED_BRANCH=prplos
 FROM registry.gitlab.com/prpl-foundation/prplos/prplos/$DESIGNATED_BRANCH/builder:latest
 
 COPY --chown=builder:builder . /home/builder/
@@ -6,4 +6,3 @@ COPY --chown=builder:builder . /home/builder/
 WORKDIR /home/builder
 RUN mkdir .ssh && ssh-keyscan gitlab.com > .ssh/known_hosts
 RUN sed -i 's;\(http[s]\?\)://\(.*@\);\1://;g' feeds.conf.default
-RUN sed -i 's/prplos.git/prplos.git;prplos-next/' feeds.conf.default
diff --git a/.gitlab/sdk.yml b/.gitlab/sdk.yml
index 39a76a7c6b..b70264b8ea 100644
--- a/.gitlab/sdk.yml
+++ b/.gitlab/sdk.yml
@@ -1,5 +1,5 @@
 variables:
-  CI_DESIGNATED_BRANCH: prplos-next
+  CI_DESIGNATED_BRANCH: prplos
 
 stages:
   - generate
@@ -23,7 +23,7 @@ stages:
     - cd $CI_SDK_TOPDIR
     - mkdir logs
 
-    - sed -i 's;https://git.openwrt.org;https://gitlab.com/openwrt;' feeds.conf.default
+    - sed -i -E 's;git.openwrt.org/(feed|project);github.com/openwrt;' feeds.conf.default
     - echo "src-include defaults feeds.conf.default" > feeds.conf
     - echo "src-link ci $CI_PROJECT_DIR" >> feeds.conf
 
@@ -155,37 +155,46 @@ stages:
 .build feed with OpenWrt SDK:
   extends: .build feed with SDK
   variables:
-    CI_SDK_BEFORE_COMPILE_COMMAND: sudo apt-get update; sudo apt-get install -y python3-yaml
+    CI_SDK_BEFORE_COMPILE_COMMAND: sudo apt-get update; sudo apt-get install -y python-yaml python3-yaml
     CI_SDK_TOPDIR: /home/build/openwrt
 
 .build feed with intel_mips-xrx500 SDK:
   extends: .build feed with SDK
   variables:
-    CI_SDK_IMAGE: prpl.registry.true.cz/prpl-foundation/prplos/prplos/$CI_DESIGNATED_BRANCH/sdk-intel_mips-xrx500:latest
+    CI_SDK_IMAGE: registry.gitlab.com/prpl-foundation/prplos/prplos/$CI_DESIGNATED_BRANCH/sdk-intel_mips-xrx500:latest
     CI_SDK_INSTALL_FEEDS: base packages luci routing feed_intel
 
 .build feed with ipq40xx-generic SDK:
   extends: .build feed with SDK
   variables:
-    CI_SDK_IMAGE: prpl.registry.true.cz/prpl-foundation/prplos/prplos/$CI_DESIGNATED_BRANCH/sdk-ipq40xx-generic:latest
+    CI_SDK_IMAGE: registry.gitlab.com/prpl-foundation/prplos/prplos/$CI_DESIGNATED_BRANCH/sdk-ipq40xx-generic:latest
 
 .build feed with mvebu-cortexa9 SDK:
   extends: .build feed with SDK
   variables:
-    CI_SDK_IMAGE: prpl.registry.true.cz/prpl-foundation/prplos/prplos/$CI_DESIGNATED_BRANCH/sdk-mvebu-cortexa9:latest
+    CI_SDK_IMAGE: registry.gitlab.com/prpl-foundation/prplos/prplos/$CI_DESIGNATED_BRANCH/sdk-mvebu-cortexa9:latest
 
 .build feed with x86-64 SDK:
   extends: .build feed with SDK
   variables:
-    CI_SDK_IMAGE: prpl.registry.true.cz/prpl-foundation/prplos/prplos/$CI_DESIGNATED_BRANCH/sdk-x86-64:latest
+    CI_SDK_IMAGE: registry.gitlab.com/prpl-foundation/prplos/prplos/$CI_DESIGNATED_BRANCH/sdk-x86-64:latest
 
 .build feed with ath79-generic-19.07.7 SDK:
   extends: .build feed with OpenWrt SDK
   variables:
     CI_SDK_IMAGE: openwrtorg/sdk:ath79-generic-19.07.7
 
-.build feed with x86-64-22.03.2 SDK:
-   extends: .build feed with OpenWrt SDK
+.build feed with x86-64-prplos-next SDK:
+   extends: .build feed with SDK
    variables:
-     CI_SDK_BEFORE_COMPILE_COMMAND: sudo apt-get update; sudo apt-get install -y python3-yaml
-     CI_SDK_IMAGE: openwrt/sdk:x86-64-22.03.2
+     CI_SDK_IMAGE: registry.gitlab.com/prpl-foundation/prplos/prplos/prplos-next/sdk-x86-64:latest
+
+.build feed with ipq807x-generic-prplos-next SDK:
+   extends: .build feed with SDK
+   variables:
+     CI_SDK_IMAGE: registry.gitlab.com/prpl-foundation/prplos/prplos/prplos-next/sdk-ipq807x-generic:latest
+
+.build feed with mvebu-cortexa9-prplos-next SDK:
+   extends: .build feed with SDK
+   variables:
+     CI_SDK_IMAGE: registry.gitlab.com/prpl-foundation/prplos/prplos/prplos-next/sdk-mvebu-cortexa9:latest