Skip to content

Commit

Permalink
ci: add cilium based service conformance
Browse files Browse the repository at this point in the history
  • Loading branch information
jpayne3506 committed Dec 15, 2023
1 parent f711cbd commit 456b759
Show file tree
Hide file tree
Showing 4 changed files with 18 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ stages:
sub: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
clusterName: ${{ parameters.clusterName }}-$(commitID)
os: ${{ parameters.os }}
cni: cilium
dependsOn: cni_tests
datapath: true
dns: true
Expand Down
16 changes: 13 additions & 3 deletions .pipelines/cni/k8s-e2e/k8s-e2e-job-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ parameters:
os: ""
dependsOn: ""
sub: ""

cni: cni

jobs:
- job: CNI_${{ parameters.os }}
Expand Down Expand Up @@ -63,15 +63,25 @@ jobs:
os: ${{ parameters.os }}
processes: 8
attempts: 3
- ${{ if eq(parameters.service, true) }}:
- ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cni') ) }}:
- template: ../k8s-e2e/k8s-e2e-step-template.yaml
parameters:
testName: Service Conformance
name: service
ginkgoFocus: 'Services.*\[Conformance\].*'
ginkgoSkip: ''
os: ${{ parameters.os }}
processes: 8
processes: 1 # change to 8 after testing complete
attempts: 3
- ${{ if and( eq(parameters.service, true), contains(parameters.cni, 'cilium') ) }}:
- template: ../k8s-e2e/k8s-e2e-step-template.yaml
parameters:
testName: Service Conformance
name: service
ginkgoFocus: 'Services.*\[Conformance\].*'
ginkgoSkip: 'should serve endpoints on same port and different protocols' # Cilium does not support this feature. For more info on test: https://github.com/kubernetes/kubernetes/blame/e602e9e03cd744c23dde9fee09396812dd7bdd93/test/conformance/testdata/conformance.yaml#L1780-L1788
os: ${{ parameters.os }}
processes: 1 # change to 8 after testing complete
attempts: 3
- ${{ if eq(parameters.hostport, true) }}:
- template: ../k8s-e2e/k8s-e2e-step-template.yaml
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,10 +64,12 @@ stages:
sub: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
clusterName: ${{ parameters.clusterName }}-$(commitID)
os: ${{ parameters.os }}
cni: cilium
dependsOn: ${{ parameters.name }}
datapath: true
dns: true
portforward: true
service: true
hostport: true

- job: failedE2ELogs
Expand Down
2 changes: 2 additions & 0 deletions .pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,12 @@ stages:
sub: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
clusterName: ${{ parameters.clusterName }}-$(commitID)
os: ${{ parameters.os }}
cni: cilium
dependsOn: ${{ parameters.name }}
datapath: true
dns: true
portforward: true
service: true
hostport: true

- job: failedE2ELogs
Expand Down

0 comments on commit 456b759

Please sign in to comment.