Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: Replace k8s conformance tests within aks-swift CI #2590

Merged
merged 1 commit into from
Feb 15, 2024
Merged

ci: Replace k8s conformance tests within aks-swift CI #2590

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .pipelines/pipeline.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@ stages:
parameters:
name: "aks_swift_e2e"
displayName: AKS Swift Ubuntu
os: linux
clusterType: swift-byocni-up
clusterName: "swifte2e"
vmSize: Standard_B2ms
Expand All @@ -472,6 +473,7 @@ stages:
parameters:
name: "aks_swift_vnetscale_e2e"
displayName: AKS Swift Vnet Scale Ubuntu
os: linux
clusterType: vnetscale-swift-byocni-up
clusterName: "vscaleswifte2e"
vmSize: Standard_B2ms
Expand Down
13 changes: 13 additions & 0 deletions .pipelines/singletenancy/aks-swift/e2e-job-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,23 @@ stages:
name: ${{ parameters.name }}
clusterName: ${{ parameters.clusterName }}-$(commitID)

- template: ../../cni/k8s-e2e/k8s-e2e-job-template.yaml
parameters:
sub: $(BUILD_VALIDATIONS_SERVICE_CONNECTION)
clusterName: ${{ parameters.clusterName }}-$(commitID)
os: ${{ parameters.os }}
dependsOn: ${{ parameters.name }}
datapath: true
dns: true
portforward: true
hostport: true
service: true

- job: failedE2ELogs
displayName: "Failure Logs"
dependsOn:
- ${{ parameters.name }}
- cni_linux
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be also parametrized by OS? (since the template as a whole is receiving os parameter now)

condition: failed()
steps:
- template: ../../templates/log-template.yaml
Expand Down
33 changes: 2 additions & 31 deletions .pipelines/singletenancy/aks-swift/e2e-step-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,18 +34,8 @@ steps:
inlineScript: |
set -e
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}
echo "install kubetest2 and gsutils"
go get github.com/onsi/ginkgo/ginkgo
go get github.com/onsi/gomega/...
go install github.com/onsi/ginkgo/ginkgo@latest
go install sigs.k8s.io/kubetest2@latest
go install sigs.k8s.io/kubetest2/kubetest2-noop@latest
go install sigs.k8s.io/kubetest2/kubetest2-tester-ginkgo@latest
wget https://storage.googleapis.com/pub/gsutil.tar.gz
tar xfz gsutil.tar.gz
sudo mv gsutil /usr/local/bin
name: "installKubetest"
displayName: "Set up Conformance Tests"
name: "kubeconfig"
displayName: "Set Kubeconfig"

- script: |
ls -lah
Expand All @@ -57,25 +47,6 @@ steps:
name: "aksswifte2e"
displayName: "Run AKS Swift E2E"

- script: |
kubectl get po -owide -A
echo "Run Service Conformance E2E"
export PATH=${PATH}:/usr/local/bin/gsutil
KUBECONFIG=~/.kube/config kubetest2 noop \
--test ginkgo -- \
--focus-regex "Services.*\[Conformance\].*"
name: "servicesConformance"
displayName: "Run Services Conformance Tests"

- script: |
echo "Run HostPort Conformance E2E"
export PATH=${PATH}:/usr/local/bin/gsutil
KUBECONFIG=~/.kube/config kubetest2 noop \
--test ginkgo -- \
--focus-regex "HostPort.*\[Conformance\].*"
name: "hostportConformance"
displayName: "Run HostPort Conformance Tests"

- script: |
echo "Run wireserver and metadata connectivity Tests"
bash test/network/wireserver_metadata_test.sh
Expand Down
Loading