Skip to content

Commit

Permalink
WG Test
Browse files Browse the repository at this point in the history
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
  • Loading branch information
tpantelis committed Jun 1, 2024
1 parent 33fe3dd commit 0fcf058
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 41 deletions.
38 changes: 5 additions & 33 deletions .github/workflows/e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,24 +17,6 @@ jobs:

- name: Build the images if necessary
uses: submariner-io/shipyard/gh-actions/cache-images@devel

# Both E2E jobs have the same name; the default job is un-suffixed, the full jobs are suffixed with their matrix combination
e2e-default:
name: E2E
needs: images
timeout-minutes: 30
runs-on: ubuntu-latest
steps:
- name: Check out the repository
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b

- name: Run E2E deployment and tests
uses: submariner-io/shipyard/gh-actions/e2e@devel

- name: Post mortem
if: failure()
uses: submariner-io/shipyard/gh-actions/post-mortem@devel

e2e-full:
name: E2E
needs: images
Expand All @@ -44,24 +26,14 @@ jobs:
strategy:
fail-fast: false
matrix:
cable-driver: ['', 'wireguard', 'vxlan']
extra-toggles: ['', 'ovn']
globalnet: ['', 'globalnet']
cable-driver: ['wireguard']
extra-toggles: ['']
globalnet: ['']
# Run most tests against the latest K8s version
k8s_version: ['1.29']
k8s_version: ['1.28']
exclude:
- cable-driver: wireguard
extra-toggles: ovn
include:
- extra-toggles: dual-stack
- extra-toggles: dual-stack, globalnet
# Oldest Kubernetes version thought to work with SubM.
# This should match minK8sMajor.minK8sMinor in subctl/pkg/version/version.go.
# If this breaks, we may advance the oldest-working K8s version instead of fixing it. See:
# https://submariner.io/development/building-testing/ci-maintenance/
- k8s_version: '1.19'
# Test top and bottom of supported K8s version range
- k8s_version: '1.26'
steps:
- name: Check out the repository
uses: actions/checkout@0ad4b8fadaa221de15dcec353f45205ec38ea70b
Expand All @@ -72,5 +44,5 @@ jobs:
using: ${{ matrix.globalnet }} ${{ matrix.cable-driver }} ${{ matrix.extra-toggles }}

- name: Post mortem
if: failure()
if: always()
uses: submariner-io/shipyard/gh-actions/post-mortem@devel
3 changes: 3 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,9 @@ bin/lichen:
$(TARGETS):
./scripts/$@

clusters:
clusters.sh

.PHONY: $(TARGETS) build licensecheck

# Not running in Dapper
Expand Down
7 changes: 7 additions & 0 deletions clusters.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#!/usr/bin/env bash

source "${SCRIPTS_DIR}"/lib/lusters_kind

kind_k8s_versions[1.28]=1.28.0@sha256:b7a4cad12c197af3ba43202d3efe03246b3f0793f162afb40a33c923952d5b31

"${SCRIPTS_DIR}"/clusters.sh "$@"
15 changes: 7 additions & 8 deletions test/e2e/redundancy/gateway_failover.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ import (
"github.com/submariner-io/shipyard/test/e2e/framework"
"github.com/submariner-io/shipyard/test/e2e/tcp"
subv1 "github.com/submariner-io/submariner/pkg/apis/submariner.io/v1"
"github.com/submariner-io/submariner/pkg/cable/wireguard"
subFramework "github.com/submariner-io/submariner/test/e2e/framework"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/types"
Expand Down Expand Up @@ -80,13 +79,13 @@ func testGatewayPodRestartScenario(f *subFramework.Framework) {
Expect(gatewayNodes).To(HaveLen(1), fmt.Sprintf("Expected only one gateway node on %q", primaryClusterName))
framework.By(fmt.Sprintf("Found gateway on node %q on %q", gatewayNodes[0].Name, primaryClusterName))

submEndpoint := f.AwaitSubmarinerEndpoint(primaryCluster, subFramework.NoopCheckEndpoint)

if submEndpoint.Spec.Backend == wireguard.CableDriverName &&
framework.DetectProvider(context.TODO(), primaryCluster, gatewayNodes[0].Name) == "kind" {
framework.Skipf("The test is known to fail on Kind 0.21+ with the wireguard cable driver - skipping the test...")
return
}
//submEndpoint := f.AwaitSubmarinerEndpoint(primaryCluster, subFramework.NoopCheckEndpoint)
//
//if submEndpoint.Spec.Backend == wireguard.CableDriverName &&
// framework.DetectProvider(context.TODO(), primaryCluster, gatewayNodes[0].Name) == "kind" {
// framework.Skipf("The test is known to fail on Kind 0.21+ with the wireguard cable driver - skipping the test...")
// return
//}

gatewayPod := f.AwaitSubmarinerGatewayPod(primaryCluster)
framework.By(fmt.Sprintf("Found submariner gateway pod %q on %q, checking node and HA status labels", gatewayPod.Name, primaryClusterName))
Expand Down

0 comments on commit 0fcf058

Please sign in to comment.