concourse: flip haiku package repositories over to backblaze

haiku · Oct 16, 2024 · 49cda45 · 49cda45
1 parent 74a0979
commit 49cda45
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 8 deletions.
diff --git a/concourse/apply-pipeline.sh b/concourse/apply-pipeline.sh
@@ -37,19 +37,19 @@ fi
 
 if [ $BRANCH == "r1beta4" ]; then
 	BUCKET_IMAGE="haiku-release-candidates"
-	BUCKET_REPO="haiku-repositories-us"
+	BUCKET_REPO="haiku-central-repositories"
 	BRANCH_PROFILE="release"
 	ARCHES="x86_64 x86_gcc2h"
 	DAYS="Sunday"
 elif [ $BRANCH == "r1beta5" ]; then
 	BUCKET_IMAGE="haiku-release-candidates"
-	BUCKET_REPO="haiku-repositories-us"
+	BUCKET_REPO="haiku-central-repositories"
 	BRANCH_PROFILE="release"
 	ARCHES="x86_64 x86_gcc2h"
 	DAYS="Sunday,Monday,Tuesday,Wednesday,Thursday,Friday,Saturday"
 else
 	BUCKET_IMAGE="haiku-nightly-us"
-	BUCKET_REPO="haiku-repositories-us"
+	BUCKET_REPO="haiku-central-repositories"
 	BRANCH_PROFILE="nightly"
 	#ARCHES="x86_64 x86_gcc2h arm sparc riscv64 ppc m68k"
 	ARCHES="x86_64 x86_gcc2h arm sparc riscv64 m68k"

diff --git a/concourse/pipelines/haiku-release.yml b/concourse/pipelines/haiku-release.yml
@@ -32,6 +32,16 @@ resources:
     source:
       uri: https://review.haiku-os.org/haiku.git
       branch: ((branch))
+  - name: backblaze
+    tags: ["((worker_tag))"]
+    type: rclone
+    source:
+      config: |
+        [remote]
+        type = b2
+        hard_delete = true
+        account = ((b2account))
+        key = ((b2secret))
   - name: wasabi-east
     tags: ["((worker_tag))"]
     type: rclone
@@ -253,18 +263,18 @@ jobs:
       - put: wasabi-east
         tags: ["((worker_tag))"]
         params:
-          source: repository.((arch))
+          source: catkeys.((arch))
           destination:
-          - dir: "remote:((bucket_repo))/((branch))/"
+          - dir: "remote:haiku-translations/"
             args:
               - -c
               #- -vv
-      - put: wasabi-east
+      - put: backblaze
         tags: ["((worker_tag))"]
         params:
-          source: catkeys.((arch))
+          source: repository.((arch))
           destination:
-          - dir: "remote:haiku-translations/"
+          - dir: "remote:((bucket_repo))/haiku/((branch))/"
             args:
               - -c
               #- -vv