Skip to content
This repository is currently being migrated. It's locked while the migration is in progress.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
name: e2e test 1.19
name: e2e test 1.24

on: [push, pull_request]

jobs:
test:
name: e2e test 1.19
name: e2e test 1.24
runs-on: ubuntu-18.04
env:
KUTTL: /usr/local/bin/kubectl-kuttl
KUBECTL_STORAGEOS: /usr/local/bin/kubectl-storageos
KIND: /usr/local/bin/kind
PLUGIN_PATH: ./kubectl-storageos
OPERATOR_IMAGE: storageos/portal-manager:develop
steps:
Expand All @@ -35,13 +36,21 @@ jobs:
sudo chmod +x kubectl-storageos
sudo mv kubectl-storageos $KUBECTL_STORAGEOS

- name: Install kind
run: |
sudo curl -Lo $KIND https://kind.sigs.k8s.io/dl/v0.14.0/kind-linux-amd64
sudo chmod +x $KIND

- name: Install kuttl
run: |
sudo curl -Lo $KUTTL https://github.com/kudobuilder/kuttl/releases/download/v0.11.1/kubectl-kuttl_0.11.1_linux_x86_64
sudo chmod +x $KUTTL

- name: Run kind
run: kind create cluster --image=storageos/kind-node:v1.24.2

- name: Run kuttl
run: kubectl-kuttl test --config e2e/kuttl/portal-manager-1.19.yaml
run: kubectl-kuttl test --config e2e/kuttl/portal-manager-1.24.yaml
env:
TENANT_ID: ${{ secrets.TENANT_ID }}
URL: ${{ secrets.URL }}
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ MANIFESTS_IMAGE ?= storageos/portal-manager-manifests:test
# Generate kuttl e2e tests for the following storageos/kind-node versions
# TEST_KIND_NODES is not intended to be updated manually.
# Please run 'LATEST_KIND_NODE=<latest-kind-node> make update-kind-nodes'.
TEST_KIND_NODES ?= 1.19.0,1.20.5,1.21.0,1.22.3,1.23.0
TEST_KIND_NODES ?= 1.20.5,1.21.0,1.22.3,1.23.0,1.24.2
REPO ?= portal-manager

# Get the currently used golang install path (in GOPATH/bin, unless GOBIN is set)
Expand Down
5 changes: 0 additions & 5 deletions e2e/kind/kind-config-1.19.yaml

This file was deleted.

2 changes: 1 addition & 1 deletion e2e/kind/kind-config-1.20.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kind: Cluster
apiVersion: kind.sigs.k8s.io/v1alpha3
apiVersion: kind.sigs.k8s.io/v1alpha4
nodes:
- role: control-plane
image: storageos/kind-node:v1.20.5
2 changes: 1 addition & 1 deletion e2e/kind/kind-config-1.21.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kind: Cluster
apiVersion: kind.sigs.k8s.io/v1alpha3
apiVersion: kind.sigs.k8s.io/v1alpha4
nodes:
- role: control-plane
image: storageos/kind-node:v1.21.0
2 changes: 1 addition & 1 deletion e2e/kind/kind-config-1.22.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kind: Cluster
apiVersion: kind.sigs.k8s.io/v1alpha3
apiVersion: kind.sigs.k8s.io/v1alpha4
nodes:
- role: control-plane
image: storageos/kind-node:v1.22.3
2 changes: 1 addition & 1 deletion e2e/kind/kind-config-1.23.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
kind: Cluster
apiVersion: kind.sigs.k8s.io/v1alpha3
apiVersion: kind.sigs.k8s.io/v1alpha4
nodes:
- role: control-plane
image: storageos/kind-node:v1.23.0
5 changes: 5 additions & 0 deletions e2e/kind/kind-config-1.24.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
kind: Cluster
apiVersion: kind.sigs.k8s.io/v1alpha4
nodes:
- role: control-plane
image: storageos/kind-node:v1.24.2
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ apiVersion: kuttl.dev/v1beta1
kind: TestSuite
testDirs:
- ./e2e/tests/stable
kindConfig: e2e/kind/kind-config-1.19.yaml
startKIND: true
kindContainers:
- storageos/portal-manager:develop
timeout: 600
2 changes: 1 addition & 1 deletion hack/generate-tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ do

cat <<EOF > "${file}"
kind: Cluster
apiVersion: kind.sigs.k8s.io/v1alpha3
apiVersion: kind.sigs.k8s.io/v1alpha4
nodes:
- role: control-plane
image: storageos/kind-node:v${kind_node}
Expand Down