Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - ci: Install 4.x.x version of k3d #1727

Closed
wants to merge 2 commits into from
Closed

[Merged by Bors] - ci: Install 4.x.x version of k3d #1727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b7e0a34
Install 4.x.x version of k3d
morenol Oct 5, 2021
7a5d400
Use environment for k3d version
morenol Oct 5, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions .github/workflows/cd_dev.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ on:

env:
USE_VERSION: ${{ github.event.inputs.alt_version }}

K3D_VERSION: v4.4.8

jobs:
# test fluvio in local cluster
Expand All @@ -49,7 +49,8 @@ jobs:
run: curl -fsS https://packages.fluvio.io/v1/install.sh | VERSION=latest bash
- name: Set up K3d for Ubuntu
if: ${{ matrix.os == 'ubuntu-latest' }}
uses: nolar/setup-k3d-k3s@v1
run: |
curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=${{ env.K3D_VERSION }} bash
- name: Set up K8 for ubuntu(kind)
if: ${{ matrix.os == 'ubuntu-latest' }}
run: ./k8-util/cluster/reset-k3d.sh
Expand Down Expand Up @@ -116,7 +117,7 @@ jobs:
- uses: actions/checkout@v2
- name: Setup K3d
run: |
curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash
curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=${{ env.K3D_VERSION }} bash
./k8-util/cluster/reset-k3d.sh
- name: Run upgrade test
timeout-minutes: 10
Expand Down Expand Up @@ -198,10 +199,10 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Setup K3d
run: curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash
run: curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=${{ env.K3D_VERSION }} bash
- name: Create K3d cluster
run: |
./k8-util/cluster/reset-k3d.sh
- name: CLI ${{ matrix.cli_version }} x Cluster ${{ matrix.cluster_version }}
run: |
make FLUVIO_BIN=~/.fluvio/bin/fluvio CLI_VERSION=${{ matrix.cli_version }} CLUSTER_VERSION=${{ matrix.cluster_version }} cli-platform-cross-version-test
make FLUVIO_BIN=~/.fluvio/bin/fluvio CLI_VERSION=${{ matrix.cli_version }} CLUSTER_VERSION=${{ matrix.cluster_version }} cli-platform-cross-version-test
7 changes: 4 additions & 3 deletions .github/workflows/cd_release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ on:

env:
USE_VERSION: ${{ github.event.inputs.alt_version }}
K3D_VERSION: v4.4.8

jobs:
installer_check:
Expand Down Expand Up @@ -77,7 +78,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Setup K3d
run: curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash
run: curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=${{ env.K3D_VERSION }} bash
- name: Create K3d cluster
run: |
./k8-util/cluster/reset-k3d.sh
Expand Down Expand Up @@ -108,7 +109,7 @@ jobs:
steps:
- uses: actions/checkout@v2
- name: Setup K3d
run: curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash
run: curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=${{ env.K3D_VERSION }} bash
- name: Create K3d cluster
run: |
./k8-util/cluster/reset-k3d.sh
Expand Down Expand Up @@ -165,4 +166,4 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: k8_release_upgrade_log
path: /tmp/k8_*.log
path: /tmp/k8_*.log
13 changes: 7 additions & 6 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ on:
env:
CARGO_TERM_COLOR: always
VERBOSE: ${{ github.events.input.verbose }}

K3D_VERSION: v4.4.8

jobs:

Expand Down Expand Up @@ -345,7 +345,6 @@ jobs:

steps:
- uses: actions/checkout@v2
- uses: nolar/setup-k3d-k3s@v1
- name: Download artifact - fluvio
uses: actions/download-artifact@v2
with:
Expand All @@ -365,7 +364,9 @@ jobs:
- name: Print artifacts and mark executable
run: chmod +x ./fluvio ./fluvio-test && ./fluvio version
- name: Set up cluster
run: ./k8-util/cluster/reset-k3d.sh
run: |
curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=${{ env.K3D_VERSION }} bash
./k8-util/cluster/reset-k3d.sh
- name: Run smoke-test
if: ${{ matrix.test == 'smoke' }}
timeout-minutes: 2
Expand Down Expand Up @@ -495,7 +496,7 @@ jobs:
- name: Install K3d
if: ${{ matrix.k8 == 'k3d' }}
run: |
curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash
curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=${{ env.K3D_VERSION }} bash
./k8-util/cluster/reset-k3d.sh
- name: Load image to K3d
if: ${{ matrix.k8 == 'k3d' }}
Expand Down Expand Up @@ -574,7 +575,7 @@ jobs:
- uses: actions/checkout@v2
- name: Setup K3d
run: |
curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash
curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=${{ env.K3D_VERSION }} bash
./k8-util/cluster/reset-k3d.sh
# Download artifacts
- name: Download artifact - fluvio
Expand Down Expand Up @@ -649,7 +650,7 @@ jobs:
- uses: actions/checkout@v2
- name: Install K3d
run: |
curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash
curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=${{ env.K3D_VERSION }} bash
./k8-util/cluster/reset-k3d.sh
- name: Install stable CLI and start Fluvio cluster
run: |
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/hourly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ jobs:
fail-fast: false
matrix:
os: [ubuntu-latest]
env:
K3D_VERSION: v4.4.8
steps:
- uses: actions/checkout@v2

Expand Down Expand Up @@ -52,7 +54,7 @@ jobs:
# If they don't match, then let's run the test

- name: Setup K3d
run: curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | bash
run: curl -s https://raw.githubusercontent.com/rancher/k3d/main/install.sh | TAG=${{ env.K3D_VERSION }} bash
- name: Create K3d cluster
run: |
./k8-util/cluster/reset-k3d.sh
Expand Down Expand Up @@ -134,4 +136,4 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: k8_longevity_log
path: /tmp/k8_*.log
path: /tmp/k8_*.log