don't use ci-builds channel by default

Signed-off-by: Justin Kolberg <[email protected]>
SumoLogic · Nov 6, 2024 · 275acb7 · 275acb7
1 parent 8f6f5b7
commit 275acb7
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/.github/workflows/build_packages.yml b/.github/workflows/build_packages.yml
@@ -237,12 +237,17 @@ jobs:
           ls -l artifacts/
           ls -l artifacts/**/*
 
-      - name: Set DARWIN_PKG_URL
+      - name: Set DARWIN_PKG_URL (macOS)
         if: ${{ steps.changed-files.outputs.any_changed == 'true' && runner.os == 'macOS' }}
         run: |
           fp="$(readlink -f artifacts/otelcol-sumo_*-intel.pkg/otelcol-sumo_*-intel.pkg)"
           echo DARWIN_PKG_URL="file://${fp}" >> $GITHUB_ENV
 
+      - name: Set S3_BUCKET (macOS)
+        if: ${{ steps.changed-files.outputs.any_changed == 'true' && runner.os == 'macOS' }}
+        run: |
+          echo S3_BUCKET="sumologic-osc-ci-builds" >> $GITHUB_ENV
+
       - name: Run install script tests (*nix)
         if: steps.changed-files.outputs.any_changed == 'true' && runner.os != 'Windows'
         working-directory: install-script/test
@@ -252,4 +257,6 @@ jobs:
         shell: powershell
         if: steps.changed-files.outputs.any_changed == 'true' && runner.os == 'Windows'
         working-directory: install-script/test
+        env:
+          S3Bucket: sumologic-osc-ci-builds
         run: make test
diff --git a/install-script/install.ps1 b/install-script/install.ps1
@@ -49,7 +49,7 @@ param (
 )
 
 if ($S3Bucket -eq "") {
-    $S3Bucket = "sumologic-osc-ci-builds"
+    $S3Bucket = "sumologic-osc-stable"
 }
 
 if ($S3Region -eq "") {

diff --git a/install-script/install.sh b/install-script/install.sh
@@ -111,7 +111,7 @@ KEEP_DOWNLOADS=false
 CURL_MAX_TIME=1800
 
 # NB: the S3 variables are only used on Darwin
-S3_BUCKET="${S3_BUCKET:-sumologic-osc-ci-builds}"
+S3_BUCKET="${S3_BUCKET:-sumologic-osc-stable}"
 S3_REGION="${S3_REGION:-us-west-2}"
 S3_URI="https://${S3_BUCKET}.s3.${S3_REGION}.amazonaws.com"
 

diff --git a/install-script/test/Makefile b/install-script/test/Makefile
@@ -3,7 +3,7 @@ ifeq ($(OS),Windows_NT)
 endif
 
 ifneq ($(OS),windows)
-	GOTESTPREFIX ?= sudo env PATH="${PATH}" GH_CI_TOKEN="${GITHUB_TOKEN}" DARWIN_PKG_URL="${DARWIN_PKG_URL}" PACKAGECLOUD_MASTER_TOKEN="${PACKAGECLOUD_MASTER_TOKEN}" PACKAGECLOUD_REPO="${PACKAGECLOUD_REPO}" OTC_VERSION="${OTC_VERSION}" OTC_BUILD_NUMBER="${OTC_BUILD_NUMBER}"
+	GOTESTPREFIX ?= sudo env PATH="${PATH}" GH_CI_TOKEN="${GITHUB_TOKEN}" DARWIN_PKG_URL="${DARWIN_PKG_URL}" PACKAGECLOUD_MASTER_TOKEN="${PACKAGECLOUD_MASTER_TOKEN}" PACKAGECLOUD_REPO="${PACKAGECLOUD_REPO}" OTC_VERSION="${OTC_VERSION}" OTC_BUILD_NUMBER="${OTC_BUILD_NUMBER}" S3_BUCKET="${S3_BUCKET}"
 endif
 
 LINT=golangci-lint