Skip to content

Commit 3d95a18

Browse files
authored
ci: Replace k8s conformance tests within aks-swift CI (#2590)
ci: k8se2e for aks-swift
1 parent a12222b commit 3d95a18

File tree

3 files changed

+17
-31
lines changed

3 files changed

+17
-31
lines changed

.pipelines/pipeline.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -461,6 +461,7 @@ stages:
461461
parameters:
462462
name: "aks_swift_e2e"
463463
displayName: AKS Swift Ubuntu
464+
os: linux
464465
clusterType: swift-byocni-up
465466
clusterName: "swifte2e"
466467
vmSize: Standard_B2ms
@@ -472,6 +473,7 @@ stages:
472473
parameters:
473474
name: "aks_swift_vnetscale_e2e"
474475
displayName: AKS Swift Vnet Scale Ubuntu
476+
os: linux
475477
clusterType: vnetscale-swift-byocni-up
476478
clusterName: "vscaleswifte2e"
477479
vmSize: Standard_B2ms

.pipelines/singletenancy/aks-swift/e2e-job-template.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,23 @@ stages:
6060
name: ${{ parameters.name }}
6161
clusterName: ${{ parameters.clusterName }}-$(commitID)
6262

63+
- template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
64+
parameters:
65+
sub: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
66+
clusterName: ${{ parameters.clusterName }}-$(commitID)
67+
os: ${{ parameters.os }}
68+
dependsOn: ${{ parameters.name }}
69+
datapath: true
70+
dns: true
71+
portforward: true
72+
hostport: true
73+
service: true
74+
6375
- job: failedE2ELogs
6476
displayName: "Failure Logs"
6577
dependsOn:
6678
- ${{ parameters.name }}
79+
- cni_linux
6780
condition: failed()
6881
steps:
6982
- template: ../../templates/log-template.yaml

.pipelines/singletenancy/aks-swift/e2e-step-template.yaml

Lines changed: 2 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -34,18 +34,8 @@ steps:
3434
inlineScript: |
3535
set -e
3636
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
37-
echo "install kubetest2 and gsutils"
38-
go get github.com/onsi/ginkgo/ginkgo
39-
go get github.com/onsi/gomega/...
40-
go install github.com/onsi/ginkgo/ginkgo@latest
41-
go install sigs.k8s.io/kubetest2@latest
42-
go install sigs.k8s.io/kubetest2/kubetest2-noop@latest
43-
go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest
44-
wget https://storage.googleapis.com/pub/gsutil.tar.gz
45-
tar xfz gsutil.tar.gz
46-
sudo mv gsutil /usr/local/bin
47-
name: "installKubetest"
48-
displayName: "Set up Conformance Tests"
37+
name: "kubeconfig"
38+
displayName: "Set Kubeconfig"
4939

5040
- script: |
5141
ls -lah
@@ -57,25 +47,6 @@ steps:
5747
name: "aksswifte2e"
5848
displayName: "Run AKS Swift E2E"
5949
60-
- script: |
61-
kubectl get po -owide -A
62-
echo "Run Service Conformance E2E"
63-
export PATH=${PATH}:/usr/local/bin/gsutil
64-
KUBECONFIG=~/.kube/config kubetest2 noop \
65-
--test ginkgo -- \
66-
--focus-regex "Services.*\[Conformance\].*"
67-
name: "servicesConformance"
68-
displayName: "Run Services Conformance Tests"
69-
70-
- script: |
71-
echo "Run HostPort Conformance E2E"
72-
export PATH=${PATH}:/usr/local/bin/gsutil
73-
KUBECONFIG=~/.kube/config kubetest2 noop \
74-
--test ginkgo -- \
75-
--focus-regex "HostPort.*\[Conformance\].*"
76-
name: "hostportConformance"
77-
displayName: "Run HostPort Conformance Tests"
78-
7950
- script: |
8051
echo "Run wireserver and metadata connectivity Tests"
8152
bash test/network/wireserver_metadata_test.sh

0 commit comments

Comments
 (0)