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

fix: change artifact naming convention #2278

Merged
merged 3 commits into from
Oct 6, 2023
Merged

fix: change artifact naming convention #2278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26944e9
fix: matching template artifacts
jpayne3506 Oct 4, 2023
bdab39f
test: jobName Parameter
jpayne3506 Oct 4, 2023
9d1f147
ci: capture all test namespaces
jpayne3506 Oct 5, 2023
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
4 changes: 2 additions & 2 deletions .pipelines/cni/cilium/cilium-overlay-load-test-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ stages:
retryCountOnTaskFailure: 6
name: "CiliumConnectivityTests"
displayName: "Run Cilium Connectivity Tests"
- job: logs
displayName: "Log Failure"
- job: failedE2ELogs
displayName: "Failure Logs"
dependsOn:
- deploy_cilium_components
- deploy_pods
Expand Down
2 changes: 1 addition & 1 deletion .pipelines/cni/cilium/nightly-release-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ stages:
testDropgz: ""
clusterName: ciliumnightly-$(commitID)
- job: logs
displayName: "Log Failure"
displayName: "Failure Logs"
dependsOn:
- cilium_nightly
condition: failed()
Expand Down
2 changes: 2 additions & 0 deletions .pipelines/cni/load-test-templates/pod-deployment-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ parameters:
iterations: 4
nodeCount: 10
cni: ""
jobName: "deploy_pods"

steps:
- task: AzureCLI@1
Expand All @@ -28,3 +29,4 @@ steps:
logType: scaleTest
os: ${{ parameters.os }}
cni: ${{ parameters.cni }}
jobName: ${{ parameters.jobName }}
2 changes: 2 additions & 0 deletions .pipelines/cni/load-test-templates/restart-cns-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ parameters:
scaleup: 100
nodeCount: 10
os: ""
jobName: "restart_cns"

steps:
- task: AzureCLI@1
Expand Down Expand Up @@ -40,3 +41,4 @@ steps:
logType: restartCNS
os: ${{ parameters.os }}
cni: ${{ parameters.cni }}
jobName: ${{ parameters.jobName }}
2 changes: 2 additions & 0 deletions .pipelines/cni/load-test-templates/restart-node-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ parameters:
scaleup: 100
os: "linux"
cni: ""
jobName: "restart_nodes"

steps:
- task: AzureCLI@1
Expand Down Expand Up @@ -38,3 +39,4 @@ steps:
logType: restartNode
os: ${{ parameters.os }}
cni: ${{ parameters.cni }}
jobName: ${{ parameters.jobName }}
31 changes: 19 additions & 12 deletions .pipelines/cni/singletenancy/cniv1-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,9 @@ stages:
inlineScript: |
echo "Delete load-test Namespace"
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
kubectl delete ns load-test
kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'
delete=`kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'`
kubectl delete ns $delete
kubectl cluster-info
kubectl get po -owide -A
name: "recover"
Expand All @@ -158,8 +160,8 @@ stages:
hybridWin: true
service: true
hostport: true
- job: logs
displayName: "Log Failure"
- job: failedE2ELogs
displayName: "Failure Logs"
dependsOn:
- update_cni
- npm_k8se2e
Expand Down Expand Up @@ -195,7 +197,7 @@ stages:
parameters:
clusterName: ${{ parameters.clusterName }}-$(commitID)
cni: cniv1
- job: deploy_pods
- job: deploy_podsHNS
displayName: "Scale Test"
dependsOn: restart_hns
steps:
Expand All @@ -206,21 +208,23 @@ stages:
os: ${{ parameters.os }}
iterations: ${{ parameters.iterations }}
nodeCount: ${{ parameters.nodeCount }}
jobName: deploy_podsHNS
- template: ../load-test-templates/validate-state-template.yaml
parameters:
clusterName: ${{ parameters.clusterName }}-$(commitID)
os: ${{ parameters.os }}
cni: cniv1
- job: restart_nodes
- job: restart_nodesHNS
displayName: "Restart Test"
dependsOn: deploy_pods
dependsOn: deploy_podsHNS
steps:
- template: ../load-test-templates/restart-node-template.yaml
parameters:
clusterName: ${{ parameters.clusterName }}-$(commitID)
os: ${{ parameters.os }}
nodeCount: ${{ parameters.nodeCount }}
scaleup: ${{ parameters.scaleup }}
jobName: restart_nodesHNS
- template: ../load-test-templates/validate-state-template.yaml
parameters:
clusterName: ${{ parameters.clusterName }}-$(commitID)
Expand All @@ -229,7 +233,7 @@ stages:
restartCase: "true"
- job: recover
displayName: "Recover Resources"
dependsOn: restart_nodes
dependsOn: restart_nodesHNS
steps:
- task: AzureCLI@1
inputs:
Expand All @@ -240,7 +244,9 @@ stages:
inlineScript: |
echo "Delete load-test Namespace"
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
kubectl delete ns load-test
kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'
delete=`kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'`
kubectl delete ns $delete
kubectl cluster-info
kubectl get po -owide -A
name: "recover"
Expand All @@ -257,12 +263,12 @@ stages:
hybridWin: true
service: true
hostport: true
- job: logs
displayName: "Log Failure"
- job: failedE2ELogsHNS
displayName: "Failure Logs"
dependsOn:
- restart_hns
- restart_nodes
- deploy_pods
- restart_nodesHNS
- deploy_podsHNS
- recover
- cni_${{ parameters.os }}
condition: failed()
Expand All @@ -271,3 +277,4 @@ stages:
parameters:
clusterName: ${{ parameters.clusterName }}-$(commitID)
os: ${{ parameters.os }}
jobName: failedE2ELogsHNS
8 changes: 5 additions & 3 deletions .pipelines/cni/singletenancy/linux-cniv2-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,9 @@ stages:
inlineScript: |
echo "Delete load-test Namespace"
make -C ./hack/aks set-kubeconf AZCLI=az CLUSTER=${{ parameters.clusterName }}-$(commitID)
kubectl delete ns load-test
kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'
delete=`kubectl get ns --no-headers | grep -v 'kube\|default' | awk '{print $1}'`
kubectl delete ns $delete
kubectl cluster-info
kubectl get po -owide -A
name: "recover"
Expand All @@ -166,8 +168,8 @@ stages:
portforward: true
service: true
hostport: true
- job: logs
displayName: "Log Failure"
- job: failedE2ELogs
displayName: "Failure Logs"
dependsOn:
- integration
- npm_k8se2e
Expand Down
4 changes: 2 additions & 2 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 @@ -63,8 +63,8 @@ stages:
testDropgz: ${{ parameters.testDropgz }}
clusterName: ${{ parameters.clusterName }}-$(commitID)

- job: logs
displayName: "Log Failure"
- job: failedE2ELogs
displayName: "Failure Logs"
dependsOn:
- ${{ parameters.name }}
condition: failed()
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/singletenancy/aks/e2e-job-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ stages:
hostport: true
dependsOn: ${{ parameters.name }}

- job: logs
displayName: "Log Failure"
- job: failedE2ELogs
displayName: "Failure Logs"
dependsOn:
- ${{ parameters.name }}
- cni_${{ parameters.os }}
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ stages:
hybridWin: true
datapath: true

- job: logs
displayName: "Log Failure"
- job: failedE2ELogs
displayName: "Failure Logs"
dependsOn:
- ${{ parameters.name }}
- cni_${{ parameters.os }}
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/singletenancy/cilium-overlay/cilium-overlay-e2e-job-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ stages:
testDropgz: ${{ parameters.testDropgz }}
clusterName: ${{ parameters.clusterName }}-$(commitID)

- job: logs
displayName: "Log Failure"
- job: failedE2ELogs
displayName: "Failure Logs"
dependsOn:
- ${{ parameters.name }}
condition: failed()
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/singletenancy/cilium/cilium-e2e-job-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ stages:
testDropgz: ${{ parameters.testDropgz }}
clusterName: ${{ parameters.clusterName }}-$(commitID)

- job: logs
displayName: "Log Failure"
- job: failedE2ELogs
displayName: "Failure Logs"
dependsOn:
- ${{ parameters.name }}
condition: failed()
Expand Down
4 changes: 2 additions & 2 deletions .pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ stages:
service: true
hybridWin: true

- job: logs
displayName: "Log Failure"
- job: failedE2ELogs
displayName: "Failure Logs"
dependsOn:
- ${{ parameters.name }}
- cni_${{ parameters.os }}
Expand Down
5 changes: 3 additions & 2 deletions .pipelines/templates/log-template.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# CNS ConfigMap | "ManageEndpointState"
# -- Generates --
# Logs on a per-node basis
# Outputs a singluar unique artifact per template call | ${{ parameters.clusterName }}_${{ parameters.logType }}_Attempt_#$(System.StageAttempt)
# Outputs a singluar unique artifact per template call | ${{ parameters.clusterName }}_${{ parameters.jobName }}_Attempt_#$(System.StageAttempt)
# Each artifact is divided into sub-directories
# -- Intent --
# Provide through debugging information to understand why CNI test scenarios are failing without having to blindly reproduce
Expand All @@ -20,6 +20,7 @@ parameters:
logType: "failure"
os: ""
cni: ""
jobName: "failedE2ELogs"

steps:
- task: AzureCLI@1
Expand Down Expand Up @@ -269,6 +270,6 @@ steps:

- publish: $(System.DefaultWorkingDirectory)/${{ parameters.clusterName }}_${{ parameters.logType }}_Attempt_#$(System.StageAttempt)
condition: always()
artifact: ${{ parameters.clusterName }}_${{ parameters.logType }}_Attempt_#$(System.StageAttempt)
artifact: ${{ parameters.clusterName }}_${{ parameters.jobName }}_Attempt_#$(System.StageAttempt)
name: acnLogs_${{ parameters.logType }}
displayName: Publish Cluster logs
Loading