Unverified Commit aa333208 authored by Derek Nola's avatar Derek Nola Committed by GitHub

Update k3s CI to run all integration tests (#4358)

* Update k3s integration CI so all tests run * Add check for ipv6 to skip test in Github CI Signed-off-by: 's avatardereknola <derek.nola@suse.com>
parent 94c1b988
...@@ -52,6 +52,8 @@ jobs: ...@@ -52,6 +52,8 @@ jobs:
chmod +x ./dist/artifacts/k3s chmod +x ./dist/artifacts/k3s
go test -coverpkg=./... -coverprofile=coverage.out ./pkg/... -run Integration go test -coverpkg=./... -coverprofile=coverage.out ./pkg/... -run Integration
go tool cover -func coverage.out go tool cover -func coverage.out
# these tests do not relate to coverage and must be run separately
go test ./tests/integration/... -run Integration
- name: On Failure, Launch Debug Session - name: On Failure, Launch Debug Session
if: ${{ failure() }} if: ${{ failure() }}
uses: mxschmitt/action-tmate@v3 uses: mxschmitt/action-tmate@v3
......
package integration package integration
import ( import (
"os"
"strings" "strings"
"testing" "testing"
...@@ -18,7 +19,7 @@ var dualStackServerArgs = []string{ ...@@ -18,7 +19,7 @@ var dualStackServerArgs = []string{
"--disable-network-policy", "--disable-network-policy",
} }
var _ = BeforeSuite(func() { var _ = BeforeSuite(func() {
if !testutil.IsExistingServer() { if !testutil.IsExistingServer() && os.Getenv("CI") != "" {
var err error var err error
dualStackServer, err = testutil.K3sStartServer(dualStackServerArgs...) dualStackServer, err = testutil.K3sStartServer(dualStackServerArgs...)
Expect(err).ToNot(HaveOccurred()) Expect(err).ToNot(HaveOccurred())
...@@ -29,6 +30,8 @@ var _ = Describe("dual stack", func() { ...@@ -29,6 +30,8 @@ var _ = Describe("dual stack", func() {
BeforeEach(func() { BeforeEach(func() {
if testutil.IsExistingServer() && !testutil.ServerArgsPresent(dualStackServerArgs) { if testutil.IsExistingServer() && !testutil.ServerArgsPresent(dualStackServerArgs) {
Skip("Test needs k3s server with: " + strings.Join(dualStackServerArgs, " ")) Skip("Test needs k3s server with: " + strings.Join(dualStackServerArgs, " "))
} else if os.Getenv("CI") == "true" {
Skip("Github environment does not support IPv6")
} }
}) })
When("a ipv4 and ipv6 cidr is present", func() { When("a ipv4 and ipv6 cidr is present", func() {
...@@ -48,7 +51,7 @@ var _ = Describe("dual stack", func() { ...@@ -48,7 +51,7 @@ var _ = Describe("dual stack", func() {
}) })
var _ = AfterSuite(func() { var _ = AfterSuite(func() {
if !testutil.IsExistingServer() { if !testutil.IsExistingServer() && os.Getenv("CI") != "" {
Expect(testutil.K3sKillServer(dualStackServer)).To(Succeed()) Expect(testutil.K3sKillServer(dualStackServer)).To(Succeed())
} }
}) })
......
...@@ -172,7 +172,7 @@ func K3sKillServer(server *K3sServer) error { ...@@ -172,7 +172,7 @@ func K3sKillServer(server *K3sServer) error {
return err return err
} }
if !flock.CheckLock(lockFile) { if !flock.CheckLock(lockFile) {
return os.Remove(lockFile) return os.RemoveAll(lockFile)
} }
return nil return nil
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment