From 5d3e3d1873b1dc79d775b1b2ebb3709b0e38280a Mon Sep 17 00:00:00 2001 From: Esteban Borai Date: Fri, 8 Dec 2023 10:23:43 -0800 Subject: [PATCH] chore: use `ctx` ci for installations (#3767) --- .github/workflows/cd_dev.yaml | 6 +++--- .github/workflows/cd_dev_mac.yaml | 2 +- .github/workflows/cd_release.yml | 4 ++-- .github/workflows/ci.yml | 2 +- .github/workflows/connector-publish.yml | 4 ++-- .github/workflows/hourly.yml | 2 +- .github/workflows/smartmodule-publish.yml | 2 +- actions/action-install-fluvio-cluster.sh | 2 +- dev-tools/smartmodule.Dockerfile | 2 +- makefiles/release.mk | 2 +- tests/cli/test_helper/fluvio_dev.bash | 4 ++-- tests/fluvio-validate-release.sh | 2 +- tests/upgrade-test.sh | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/cd_dev.yaml b/.github/workflows/cd_dev.yaml index b48e9d4ff4..c85b020b9f 100644 --- a/.github/workflows/cd_dev.yaml +++ b/.github/workflows/cd_dev.yaml @@ -85,7 +85,7 @@ jobs: run: ./k8-util/cluster/reset-k3d.sh - name: Install Fluvio CLI run: | - curl -fsS https://hub.infinyon.cloud/install/install.sh | FLUVIO_VERSION=latest bash + curl -fsS https://hub.infinyon.cloud/install/install.sh?ctx=ci | FLUVIO_VERSION=latest bash echo "$HOME/.fluvio/bin" >> $GITHUB_PATH - name: Install Local Fluvio cluster timeout-minutes: 3 @@ -208,7 +208,7 @@ jobs: # Utilizes the env var set in the previous step - name: Curl Install - run: curl -fsS https://hub.infinyon.cloud/install/install.sh | bash | tee /tmp/installer.version + run: curl -fsS https://hub.infinyon.cloud/install/install.sh?ctx=ci | bash | tee /tmp/installer.version - name: Verify installer output run: | @@ -248,7 +248,7 @@ jobs: - name: Install stable CLI and start Fluvio cluster timeout-minutes: 10 run: | - curl -fsS https://hub.infinyon.cloud/install/install.sh | VERSION=${{ matrix.cluster_version }} bash + curl -fsS https://hub.infinyon.cloud/install/install.sh?ctx=ci | VERSION=${{ matrix.cluster_version }} bash fluvio cluster start --local - name: CLI ${{ matrix.cli_version }} x Cluster ${{ matrix.cluster_version }} run: | diff --git a/.github/workflows/cd_dev_mac.yaml b/.github/workflows/cd_dev_mac.yaml index b8d64d8dee..f13d0c3299 100644 --- a/.github/workflows/cd_dev_mac.yaml +++ b/.github/workflows/cd_dev_mac.yaml @@ -56,7 +56,7 @@ jobs: kind create cluster --config k8-util/cluster/kind.yaml - name: Install Fluvio CLI run: | - curl -fsS https://hub.infinyon.cloud/install/install.sh | VERSION=latest bash + curl -fsS https://hub.infinyon.cloud/install/install.sh?ctx=ci | VERSION=latest bash echo "$HOME/.fluvio/bin" >> $GITHUB_PATH - name: Install Local Fluvio cluster timeout-minutes: 3 diff --git a/.github/workflows/cd_release.yml b/.github/workflows/cd_release.yml index 0b331287fa..a72b6c78d3 100644 --- a/.github/workflows/cd_release.yml +++ b/.github/workflows/cd_release.yml @@ -74,7 +74,7 @@ jobs: # Utilizes the env var set in the previous step - name: Curl Install - run: curl -fsS https://hub.infinyon.cloud/install/install.sh | bash | tee /tmp/installer.version + run: curl -fsS https://hub.infinyon.cloud/install/install.sh?ctx=ci | bash | tee /tmp/installer.version - name: Verify installer output run: | @@ -119,7 +119,7 @@ jobs: - run: echo "VERSION=$EXPECTED_VERSION" | tee -a $GITHUB_ENV - name: Install Fluvio run: | - curl -fsS https://hub.infinyon.cloud/install/install.sh | bash + curl -fsS https://hub.infinyon.cloud/install/install.sh?ctx=ci | bash echo "$HOME/.fluvio/bin" >> $GITHUB_PATH - name: Start cluster timeout-minutes: 10 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c80bc97871..5f9b91a596 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -948,7 +948,7 @@ jobs: # from now, fluvio will be stable - name: Install stable CLI and start Fluvio cluster run: | - curl -fsS https://hub.infinyon.cloud/install/install.sh | bash + curl -fsS https://hub.infinyon.cloud/install/install.sh?ctx=ci | bash echo "~/.fluvio/bin" >> $GITHUB_PATH # Download artifacts from development build diff --git a/.github/workflows/connector-publish.yml b/.github/workflows/connector-publish.yml index ef17999d58..accff6f868 100644 --- a/.github/workflows/connector-publish.yml +++ b/.github/workflows/connector-publish.yml @@ -50,7 +50,7 @@ jobs: steps: - name: Install Fluvio run: | - curl -fsS https://hub.infinyon.cloud/install/install.sh | bash + curl -fsS https://hub.infinyon.cloud/install/install.sh?ctx=ci | bash echo "$HOME/.fluvio/bin" >> $GITHUB_PATH - name: Install Fluvio CDK run: fluvio install cdk --develop @@ -88,7 +88,7 @@ jobs: steps: - name: Install Fluvio run: | - curl -fsS https://hub.infinyon.cloud/install/install.sh | bash + curl -fsS https://hub.infinyon.cloud/install/install.sh?ctx=ci | bash echo "$HOME/.fluvio/bin" >> $GITHUB_PATH - name: Install Fluvio CDK run: fluvio install cdk --develop diff --git a/.github/workflows/hourly.yml b/.github/workflows/hourly.yml index 788260629a..3f94a504fc 100644 --- a/.github/workflows/hourly.yml +++ b/.github/workflows/hourly.yml @@ -154,7 +154,7 @@ jobs: ./k8-util/cluster/reset-k3d.sh - name: Install Fluvio CLI and start cluster run: | - curl -fsS https://hub.infinyon.cloud/install/install.sh | VERSION=latest bash + curl -fsS https://hub.infinyon.cloud/install/install.sh?ctx=ci | VERSION=latest bash echo "$HOME/.fluvio/bin" >> $GITHUB_PATH - name: Start Fluvio Cluster run: | diff --git a/.github/workflows/smartmodule-publish.yml b/.github/workflows/smartmodule-publish.yml index 290aebb2da..6b7c03e4e9 100644 --- a/.github/workflows/smartmodule-publish.yml +++ b/.github/workflows/smartmodule-publish.yml @@ -33,7 +33,7 @@ jobs: steps: - name: Install Fluvio run: | - curl -fsS https://hub.infinyon.cloud/install/install.sh | bash + curl -fsS https://hub.infinyon.cloud/install/install.sh?ctx=ci | bash echo "$HOME/.fluvio/bin" >> $GITHUB_PATH - name: Install Fluvio SMDK run: fluvio install smdk diff --git a/actions/action-install-fluvio-cluster.sh b/actions/action-install-fluvio-cluster.sh index 8f275892d4..8bd38719c4 100755 --- a/actions/action-install-fluvio-cluster.sh +++ b/actions/action-install-fluvio-cluster.sh @@ -5,7 +5,7 @@ set -eu -o pipefail echo "Installing Fluvio Local Cluster" -curl -fsS https://hub.infinyon.cloud/install/install.sh | bash +curl -fsS https://hub.infinyon.cloud/install/install.sh?ctx=ci | bash echo 'export PATH="$HOME/.fluvio/bin:$PATH"' >> $HOME/.bash_profile . $HOME/.bash_profile diff --git a/dev-tools/smartmodule.Dockerfile b/dev-tools/smartmodule.Dockerfile index 18b6b02ba5..02cffafa18 100644 --- a/dev-tools/smartmodule.Dockerfile +++ b/dev-tools/smartmodule.Dockerfile @@ -43,7 +43,7 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y RUN source "$HOME/.cargo/env" # setup fluvio -RUN curl -fsS https://hub.infinyon.cloud/install/install.sh | bash +RUN curl -fsS https://hub.infinyon.cloud/install/install.sh?ctx=ci | bash # add Fluvio smartmodule deps # source cargo/env is a little bit of a workaround diff --git a/makefiles/release.mk b/makefiles/release.mk index 96e745111c..a8f0aca0fd 100644 --- a/makefiles/release.mk +++ b/makefiles/release.mk @@ -112,7 +112,7 @@ docker-push-manifest-dev: docker-create-manifest-dev docker-push-manifest # Uses $(VERSION) curl-install-fluvio: - curl -fsS https://hub.infinyon.cloud/install/install.sh | bash + curl -fsS https://hub.infinyon.cloud/install/install.sh?ctx=ci | bash install-fluvio-stable: VERSION=stable install-fluvio-stable: curl-install-fluvio diff --git a/tests/cli/test_helper/fluvio_dev.bash b/tests/cli/test_helper/fluvio_dev.bash index c0094e7267..cc9f0009d4 100644 --- a/tests/cli/test_helper/fluvio_dev.bash +++ b/tests/cli/test_helper/fluvio_dev.bash @@ -54,7 +54,7 @@ function setup_fluvio_cluster() { echo "# Installing cluster @ VERSION: $CLUSTER_VERSION" >&3 $FLUVIO_BIN version >&3 - curl -fsS https://hub.infinyon.cloud/install/install.sh | VERSION=$CLUSTER_VERSION bash + curl -fsS https://hub.infinyon.cloud/install/install.sh?ctx=ci | VERSION=$CLUSTER_VERSION bash echo "# Starting cluster @ VERSION: $CLUSTER_VERSION" >&3 if [ "$CLUSTER_VERSION" = "latest" ]; then @@ -73,6 +73,6 @@ function setup_fluvio_cluster() { function setup_fluvio_cli() { CLI_VERSION=${1:-latest} echo "Installing CLI @ VERSION: $CLI_VERSION" >&3 - curl -fsS https://hub.infinyon.cloud/install/install.sh | VERSION=$CLI_VERSION bash + curl -fsS https://hub.infinyon.cloud/install/install.sh?ctx=ci | VERSION=$CLI_VERSION bash $FLUVIO_BIN version >&3 } diff --git a/tests/fluvio-validate-release.sh b/tests/fluvio-validate-release.sh index 8991517a3a..6e01ef146a 100755 --- a/tests/fluvio-validate-release.sh +++ b/tests/fluvio-validate-release.sh @@ -10,7 +10,7 @@ readonly FLUVIO_COMMIT_CHECK=${2?Pass in expected commit in pos 2} # This function should always run first function validate_installer_output() { # Validate the installer output returns the expected version - curl -fsS https://hub.infinyon.cloud/install/install.sh | bash | tee /tmp/installer.output + curl -fsS https://hub.infinyon.cloud/install/install.sh?ctx=ci | bash | tee /tmp/installer.output INSTALLED_FLUVIO_VERSION=$(cat /tmp/installer.output | grep "Downloading Fluvio" | awk '{print $5}' | tr -d '[:space:]') EXPECTED_FLUVIO_VERSION=$FLUVIO_VERSION_CHECK diff --git a/tests/upgrade-test.sh b/tests/upgrade-test.sh index 319f8008e9..eb8617d985 100755 --- a/tests/upgrade-test.sh +++ b/tests/upgrade-test.sh @@ -63,7 +63,7 @@ function validate_cluster_stable() { echo "Install (current stable) CLI" unset VERSION - curl -fsS https://hub.infinyon.cloud/install/install.sh | bash + curl -fsS https://hub.infinyon.cloud/install/install.sh?ctx=ci | bash ~/.fvm/bin/fvm install stable | tee /tmp/installer.output STABLE_VERSION=$(cat /tmp/installer.output | grep "fluvio@" | awk '{print $4}' | cut -b 8-)