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.

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: Updating k8s test suite for NPM to latest #2707

Merged
merged 2 commits into from
Apr 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions .pipelines/cni/pipeline.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ stages:
displayName: "Build k8s NPM Linux Test Suite Binary"
steps:
- bash: |
git clone https://github.com/huntergregory/kubernetes.git --depth=1 --branch=linux-long-sleep
git clone https://github.com/kubernetes/kubernetes.git --depth=1
cd kubernetes
export PATH=$PATH:/usr/local/go/bin/
make WHAT=test/e2e/e2e.test
Expand All @@ -128,7 +128,7 @@ stages:
displayName: "Build k8s NPM Windows Test Suite Binary"
steps:
- bash: |
git clone https://github.com/huntergregory/kubernetes.git --depth=1 --branch=sleep-before-probing
git clone https://github.com/kubernetes/kubernetes.git --depth=1
cd kubernetes
export PATH=$PATH:/usr/local/go/bin/
make WHAT=test/e2e/e2e.test
Expand Down Expand Up @@ -349,7 +349,7 @@ stages:
vmSize: Standard_HC44-16rs
arch: amd64
cni: "cilium"

- template: cilium/cilium-overlay-load-test-template.yaml
parameters:
name: cilium_overlay_ds
Expand Down
3 changes: 2 additions & 1 deletion .pipelines/npm/npm-cni-integration-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ jobs:
--provider=local \
--ginkgo.focus="$focus" \
--ginkgo.skip="NetworkPolicyLegacy|SCTP" \
--kubeconfig=$HOME/.kube/config
--kubeconfig=$HOME/.kube/config \
--ginkgo.timeout="2h"
jpayne3506 marked this conversation as resolved.
Show resolved Hide resolved
displayName: "Run Kubernetes e2e.test"
continueOnError: ${{ parameters.continueOnError }}

Expand Down
10 changes: 5 additions & 5 deletions .pipelines/npm/npm-conformance-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
- checkout: self

- bash: |
git clone https://github.com/huntergregory/kubernetes.git --depth=1 --branch=linux-sleep-before-probing
git clone https://github.com/kubernetes/kubernetes.git --depth=1
cd kubernetes
export PATH=$PATH:/usr/local/go/bin/
make WHAT=test/e2e/e2e.test
Expand Down Expand Up @@ -140,7 +140,7 @@ jobs:
scriptLocation: "inlineScript"
failOnStderr: true
inlineScript: |
# get kubectl
# get kubectl
curl -LO https://dl.k8s.io/release/v1.23.0/bin/linux/amd64/kubectl
chmod +x kubectl
echo Cluster $(AZURE_CLUSTER)
Expand Down Expand Up @@ -204,7 +204,7 @@ jobs:
./kubectl --kubeconfig=./kubeconfig set image daemonset/azure-npm-win -n kube-system azure-npm=$IMAGE_REGISTRY/azure-npm:windows-amd64-ltsc2022-$(TAG)

else
echo "Creating Linux Cluster";
echo "Creating Linux Cluster";
az aks create --no-ssh-key \
--resource-group $(RESOURCE_GROUP) \
--name $(AZURE_CLUSTER) \
Expand Down Expand Up @@ -261,7 +261,7 @@ jobs:
}

runConformanceWindows () {
git clone https://github.com/huntergregory/kubernetes.git
git clone https://github.com/kubernetes/kubernetes.git --depth=1
cd kubernetes
git checkout sleep-before-probing
export PATH=$PATH:/usr/local/go/bin/
Expand All @@ -286,7 +286,7 @@ jobs:
declare -a conformancePIDs
for round in $(seq 1 $NUM_PARALLEL_JOBS_FOR_STRESS_TEST); do
# for each iteration, run the conformance test and echos in the background, and write the output of the conformance test to a file

# run the conformance test in the foreground and write the output to stdout and a file
if [[ $(AZURE_CLUSTER) == *ws22 ]] # * is used for pattern matching
then
Expand Down
Loading