Merge pull request 'Remove internal URLs from CI' (#219) from feature/ci into master

Reviewed-on: #219

.ci/pipelines/base.yml

@@ -6,24 +6,30 @@ resource_types:
 - name: gitea-package
   type: registry-image
   source:
-    repository: registry.local:5000/gitea-package
+    repository: registry.sclu1034.dev/gitea-package
+    username: ((registry_user))
+    password: ((registry_password))
 
 - name: gitea-status
   type: registry-image
   source:
-    repository: registry.local:5000/gitea-status
+    repository: registry.sclu1034.dev/gitea-status
+    username: ((registry_user))
+    password: ((registry_password))
 
 - name: gitea-pr
   type: registry-image
   source:
-    repository: registry.local:5000/gitea-pr
+    repository: registry.sclu1034.dev/gitea-pr
+    username: ((registry_user))
+    password: ((registry_password))
 
 
 resources:
 - name: repo
   type: git
   source:
-    uri: http://forgejo:3000/bitsquid_dt/dtmt
+    uri: http://git.sclu1034.dev/bitsquid_dt/dtmt
     branch: master
 
 - name: repo-pr
@@ -38,7 +44,7 @@ resources:
   type: gitea-package
   source:
     access_token: ((gitea_api_key))
-    url: http://forgejo:3000
+    url: http://git.sclu1034.dev
     owner: bitsquid_dt
     type: generic
     name: dtmt
@@ -48,7 +54,7 @@ resources:
   type: gitea-status
   source:
     access_token: ((gitea_api_key))
-    url: http://forgejo:3000
+    url: http://git.sclu1034.dev
     owner: bitsquid_dt
     repo: dtmt
     context: build/msvc
@@ -58,7 +64,7 @@ resources:
   type: gitea-status
   source:
     access_token: ((gitea_api_key))
-    url: http://forgejo:3000
+    url: http://git.sclu1034.dev
     owner: bitsquid_dt
     repo: dtmt
     context: build/linux
@@ -85,6 +91,8 @@ jobs:
     vars:
       pr: ((.:pr))
       gitea_api_key: ((gitea_api_key))
+      registry_user: ((registry_user))
+      registry_password: ((registry_password))
     instance_vars:
       number: ((.:pr.number))
 
@@ -192,7 +200,7 @@ jobs:
     vars:
       pr: ""
       target: linux
-      gitea_url: http://forgejo:3000
+      gitea_url: http://git.sclu1034.dev
       gitea_api_key: ((gitea_api_key))
 
   - load_var: version_number

.ci/pipelines/pr.yml

@@ -6,26 +6,30 @@ resource_types:
 - name: gitea-package
   type: registry-image
   source:
-    repository: registry.local:5000/gitea-package
+    repository: registry.sclu1034.dev/gitea-package
+    username: ((registry_user))
+    password: ((registry_password))
 
 - name: gitea-status
   type: registry-image
   source:
-    repository: registry.local:5000/gitea-status
+    repository: registry.sclu1034.dev/gitea-status
+    username: ((registry_user))
+    password: ((registry_password))
 
 
 resources:
 - name: repo
   type: git
   source:
-    uri: http://forgejo:3000/bitsquid_dt/dtmt
+    uri: http://git.sclu1034.dev/bitsquid_dt/dtmt
     branch: ((pr.head.ref))
 
 - name: gitea-package
   type: gitea-package
   source:
     access_token: ((gitea_api_key))
-    url: http://forgejo:3000
+    url: http://git.sclu1034.dev
     owner: bitsquid_dt
     type: generic
     name: dtmt
@@ -34,7 +38,7 @@ resources:
   type: gitea-status
   source:
     access_token: ((gitea_api_key))
-    url: http://forgejo:3000
+    url: http://git.sclu1034.dev
     owner: bitsquid_dt
     repo: dtmt
     context: lint/clippy
@@ -44,7 +48,7 @@ resources:
   type: gitea-status
   source:
     access_token: ((gitea_api_key))
-    url: http://forgejo:3000
+    url: http://git.sclu1034.dev
     owner: bitsquid_dt
     repo: dtmt
     context: build/msvc
@@ -54,7 +58,7 @@ resources:
   type: gitea-status
   source:
     access_token: ((gitea_api_key))
-    url: http://forgejo:3000
+    url: http://git.sclu1034.dev
     owner: bitsquid_dt
     repo: dtmt
     context: build/linux
@@ -135,7 +139,7 @@ jobs:
     vars:
       target: msvc
       pr: ((pr))
-      gitea_url: http://forgejo:3000
+      gitea_url: http://git.sclu1034.dev
       gitea_api_key: ((gitea_api_key))
 
   - load_var: version_number
@@ -193,7 +197,7 @@ jobs:
     vars:
       target: linux
       pr: ((pr))
-      gitea_url: http://forgejo:3000
+      gitea_url: http://git.sclu1034.dev
       gitea_api_key: ((gitea_api_key))
 
   - load_var: version_number

Justfile

@@ -40,6 +40,8 @@ set-base-pipeline:
         --pipeline dtmt \
         --config .ci/pipelines/base.yml \
         -v gitea_api_key=${GITEA_API_KEY} \
+        -v registry_user=${REGISTRY_USER} \
+        -v registry_password=${REGISTRY_PASSWORD} \
         -v owner=bitsquid_dt \
         -v repo=dtmt