.gitlab-ci.yml

@@ -12,7 +12,7 @@ mr-settings:
   before_script:
     - apk -q add python3
   script:
-    - wget -q "https://gitlab.com/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
+    - wget -q "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/check_mr_settings.py"
     - python3 ./check_mr_settings.py
 
 ruff:
@@ -35,7 +35,7 @@ pytest:
   <<: *only-default
   image: "alpine:3.18"  # has sqlalchemy<2.0
   before_script:
-  - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+  - wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
   - PMBOOTSTRAP_TAG=master sh ./install_pmbootstrap.sh
   - ln -s /tmp/pmbootstrap ../pmbootstrap
   script:
@@ -59,7 +59,7 @@ pytest-pmb-v2:
   <<: *only-default
   image: "alpine:3.18"  # has sqlalchemy<2.0
   before_script:
-  - wget "https://gitlab.com/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
+  - wget "https://gitlab.postmarketos.org/postmarketOS/ci-common/-/raw/master/install_pmbootstrap.sh"
   - PMBOOTSTRAP_TAG=2.3.x sh ./install_pmbootstrap.sh
   - ln -s /tmp/pmbootstrap ../pmbootstrap_v2
   script:

README.md

@@ -5,7 +5,7 @@
 Requires python 3.7 or higher.
 
 ```
-$ git clone https://gitlab.com/postmarketOS/build.postmarketos.org
+$ git clone https://gitlab.postmarketos.org/postmarketOS/build.postmarketos.org
 $ cd build.postmarketos.org
 $ python3 -m venv .venv
 $ source .venv/bin/activate

bpo/config/const/__init__.py

@@ -39,7 +39,7 @@ branches["master"] = {
 }
 
 # Current default is 2.3.x until pmbootstrap v3 is stable:
-# https://gitlab.com/postmarketOS/pmbootstrap/-/milestones/1
+# https://gitlab.postmarketos.org/postmarketOS/pmbootstrap/-/milestones/1
 pmb_branch_default = "2.3.x"
 
 # Build staging repositories for these architectures
@@ -89,7 +89,7 @@ pattern_apk_name = re.compile("^[a-z0-9._+-]+\\.apk$")
 
 # Where log messages should link to when displaying commits. The commit will be
 # appended to the URL.
-commit_url = "https://gitlab.com/postmarketOS/pmaports/-/commit"
+commit_url = "https://gitlab.postmarketos.org/postmarketOS/pmaports/-/commit"
 
 # Directory listings generated for images.postmarketos.org/bpo use this URL to
 # set the path to BPO's style.css. Override it for development (see README).

bpo/config/const/images.py

@@ -211,7 +211,7 @@ images = {
         "branch_configs": {
             "all": {
                 # Disable plasma-desktop:
-                # https://gitlab.com/postmarketOS/build.postmarketos.org/-/issues/136
+                # https://gitlab.postmarketos.org/postmarketOS/build.postmarketos.org/-/issues/136
                 "ui": get_ui_list(chassis=["laptop", "convertible", "tablet"],
                                   exclude_ui=["plasma-desktop"]),
                 "kernels": [
@@ -266,7 +266,8 @@ images = {
     },
     "google-nyan-big": {
         "branches": [
-            "master",
+            # Disabled on master:
+            # https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3186
             "v24.06",
         ],
         "branch_configs": {
@@ -281,7 +282,8 @@ images = {
     },
     "google-nyan-blaze": {
         "branches": [
-            "master",
+            # Disabled on master:
+            # https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3186
             "v24.06",
         ],
         "branch_configs": {
@@ -358,7 +360,7 @@ images = {
     "google-x64cros": {
         "branches": [
             # master is temporarily disabled:
-            # https://gitlab.com/postmarketOS/pmaports/-/issues/3095
+            # https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/3095
             "v24.06",
         ],
         "branch_configs": {
@@ -452,7 +454,7 @@ images = {
     "pine64-rockpro64": {
         "branch_configs": {
             # Disable plasma bigscreen for master, v24.06:
-            # https://gitlab.com/postmarketOS/pmaports/-/issues/2650
+            # https://gitlab.postmarketos.org/postmarketOS/pmaports/-/issues/2650
             "all": {
                 "ui": get_ui_list(chassis=["embedded"]),
             },
@@ -465,7 +467,7 @@ images = {
         "branch_configs": {
             "master": {
                 "date-interval": 3,
-                "ui": ["gnome-mobile", "console"],
+                "ui": ["gnome", "console"],
             },
         }
     },

bpo/job_services/sourcehut.py

@@ -66,9 +66,9 @@ def get_manifest(name, tasks, branch):
         - py3-requests
         - xz
         sources:
-        - "https://gitlab.com/postmarketOS/pmaports.git/"
-        - "https://gitlab.com/postmarketOS/pmbootstrap.git/"
-        - "https://gitlab.com/postmarketOS/build.postmarketos.org.git/"
+        - "https://gitlab.postmarketos.org/postmarketOS/pmaports.git/"
+        - "https://gitlab.postmarketos.org/postmarketOS/pmbootstrap.git/"
+        - "https://gitlab.postmarketos.org/postmarketOS/build.postmarketos.org.git/"
         environment:
           BPO_TOKEN_FILE: "/home/build/.token"
           BPO_API_HOST: """ + shlex.quote(url_api) + """

data/templates/index.html

@@ -21,7 +21,7 @@
     <span class="nav header-bottom">
         <a href="https://postmarketos.org">about</a>
         <a href="https://pkgs.postmarketos.org">package search</a>
-        <a href="https://gitlab.com/postmarketOS/pmaports">build recipes</a>
+        <a href="https://gitlab.postmarketos.org/postmarketOS/pmaports">build recipes</a>
         <a href="https://images.postmarketos.org/bpo/">images</a>
     </span>
     <span class="powered-by header-bottom">powered by
@@ -186,7 +186,7 @@
             "built"
             {% elif entry.action == "remove_broken_apk" %}
             <b>broken package, removing</b>
-            (<a href="https://gitlab.com/postmarketOS/build.postmarketos.org/issues/56">#56</a>)
+            (<a href="https://gitlab.postmarketos.org/postmarketOS/build.postmarketos.org/issues/56">#56</a>)
             {% elif entry.action == "remove_broken_apk_reset_deleted" %}
             changing status back to "queued" after apk was removed
             {% elif entry.action == "remove_broken_apk_reset_failed" %}
@@ -439,7 +439,7 @@
 <footer>
     <div class="source">
         AGPL-3.0
-        (<a href="https://gitlab.com/postmarketOS/build.postmarketos.org"
+        (<a href="https://gitlab.postmarketos.org/postmarketOS/build.postmarketos.org"
         >source</a>)
     </div>
     <div class="copyright">

test/bpo_test/trigger.py

@@ -64,7 +64,7 @@ def push_hook_gitlab(branch="master", background=False, after="deadbeef"):
                [{"id": "5e9e102a00e58541ed91164de15fd209af628b42",
                  "message": "main/postmarketos-ui-phosh: clean-up\n",
                  "timestamp": "2019-05-25T16:23:30Z",
-                 "url": "https://gitlab.com/...d91164de15fd209af628b42",
+                 "url": "https://gitlab.postmarketos.org/...d91164de15fd209af628b42",
                  "author": {"name": "John Doe", "email": "john@localhost"},
                  "added": [],
                  "modified": ["main/hello-world/APKBUILD"],

test/pytest.ini

@@ -3,7 +3,7 @@ addopts = --strict-markers
 markers =
     skip_ci
     img_dir_gen
-timeout = 3
+timeout = 10
 
 # Kill all threads on timeout
 timeout_method = thread

test/test_push_hook_gitlab.py

@@ -28,7 +28,7 @@ def test_push_hook_gitlab_get_pkgnames_commits():
                [{"id": "1337f00",
                  "message": "main/postmarketos-ui-phosh: clean-up\n",
                  "timestamp": "2019-05-25T16:23:30Z",
-                 "url": "https://gitlab.com/...d91164de15fd209af628b42",
+                 "url": "https://gitlab.postmarketos.org/...d91164de15fd209af628b42",
                  "author": {"name": "John Doe", "email": "john@localhost"},
                  "added": ["device/main/device-pine64-pinephone/APKBUILD",
                            "main/hello-world/APKBUILD",