Skip to content

Commit

Permalink
testing: fix ginkgo installation, add Kubernetes versions (#449)
Browse files Browse the repository at this point in the history
* testing: fix ginkgo installation, use tools file for proper modules download
* testing: add more Kubernetes versions

Signed-off-by: Ivan Mikheykin <[email protected]>
  • Loading branch information
diafour authored Dec 16, 2022
1 parent 35d6404 commit f056455
Show file tree
Hide file tree
Showing 4 changed files with 30 additions and 9 deletions.
26 changes: 17 additions & 9 deletions .github/workflows/tests-labeled.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,15 +46,21 @@ jobs:
fail-fast: true
matrix:
include:
- k8s_version: "1.16"
kind_node_image: "kindest/node:v1.16.15"
cluster_name: "kube-1-16"
- k8s_version: "1.19"
kind_node_image: "kindest/node:v1.19.7"
kind_node_image: "kindest/node:v1.19.16"
cluster_name: "kube-1-19"
- k8s_version: "1.20"
kind_node_image: "kindest/node:v1.20.2"
kind_node_image: "kindest/node:v1.20.15"
cluster_name: "kube-1-20"
- k8s_version: "1.23"
kind_node_image: "kindest/node:v1.23.13"
cluster_name: "kube-1-23"
- k8s_version: "1.24"
kind_node_image: "kindest/node:v1.24.7"
cluster_name: "kube-1-24"
- k8s_version: "1.25"
kind_node_image: "kindest/node:v1.25.2"
cluster_name: "kube-1-25"
runs-on: ubuntu-latest
steps:
- name: Set up Go 1.19
Expand Down Expand Up @@ -87,13 +93,15 @@ jobs:
- name: Install ginkgo
run: |
go build github.com/onsi/ginkgo/ginkgo
./ginkgo version
go install github.com/onsi/ginkgo/ginkgo
echo $PATH
ls -la $GOPATH/bin
ginkgo version
- name: Start kind cluster
uses: engineerd/[email protected]
with:
version: "v0.11.1"
version: "v0.17.0"
image: ${{ matrix.kind_node_image }}
name: ${{ matrix.cluster_name }}

Expand All @@ -106,7 +114,7 @@ jobs:
export CGO_LDFLAGS="-L$GITHUB_WORKSPACE/libjq/lib"
export GOOS=linux
./ginkgo \
ginkgo \
--tags 'integration test' \
--vet off \
--race \
Expand Down
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ require (
github.com/go-openapi/loads v0.19.5 // indirect
github.com/go-openapi/runtime v0.19.16 // indirect
github.com/go-stack/stack v1.8.0 // indirect
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.2 // indirect
github.com/google/btree v1.0.1 // indirect
Expand Down Expand Up @@ -84,6 +85,7 @@ require (
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/tools v0.1.12 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/protobuf v1.28.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
Expand Down
3 changes: 3 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ github.com/go-openapi/swag v0.19.14 h1:gm3vOOXfiuw5i9p5N9xJvfjvuofpyvLA9Wr6QfK5F
github.com/go-openapi/swag v0.19.14/go.mod h1:QYRuS/SOXUCsnplDa677K7+DxSOj6IPNl/eQntq43wQ=
github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0 h1:p104kn46Q8WdvHunIJ9dAyjPVtrBPhSr3KT2yUst43I=
github.com/go-task/slim-sprig v0.0.0-20210107165309-348f09dbbbc0/go.mod h1:fyg7847qk6SyHyPtNmDHnmrv/HOrqktSC+C9fM+CJOE=
github.com/gobuffalo/attrs v0.0.0-20190224210810-a9411de4debd/go.mod h1:4duuawTqi2wkkpB4ePgWMaai6/Kc6WEz83bhFwpHzj0=
github.com/gobuffalo/depgen v0.0.0-20190329151759-d478694a28d3/go.mod h1:3STtPUQYuzV0gBVOY3vy6CfMm/ljR4pABfrTeHNLHUY=
Expand Down Expand Up @@ -717,6 +718,8 @@ golang.org/x/tools v0.1.2/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.3/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down
8 changes: 8 additions & 0 deletions tools/ginkgo.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
//go:build tools

package tools

import (
_ "github.com/onsi/ginkgo/ginkgo"
_ "github.com/onsi/ginkgo/ginkgo/outline"
)

0 comments on commit f056455

Please sign in to comment.