Skip to content

Commit f1e8ceb

Browse files
authored
backport: ci: clean up disk space before build and skip windows port forward (#4109) (#4118)
* ci: clean up disk space before build and skip windows port forward (#4109) * clean up disk space before build * skip portforward e2e in windows * skip windows port forward v1.5
1 parent 69ec773 commit f1e8ceb

File tree

5 files changed

+35
-6
lines changed

5 files changed

+35
-6
lines changed

.pipelines/containers/container-template.yaml

Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,40 @@ steps:
1616
1717
- script: |
1818
set -e
19+
echo "Disk space before cleanup..."
20+
df -h /
21+
echo "Removing unnecessary files to free up disk space..."
22+
sudo rm -rf \
23+
/opt/hostedtoolcache \
24+
/opt/google/chrome \
25+
/opt/microsoft/msedge \
26+
/opt/microsoft/powershell \
27+
/opt/pipx \
28+
/usr/lib/mono \
29+
/usr/local/julia* \
30+
/usr/local/lib/android \
31+
/usr/local/lib/node_modules \
32+
/usr/local/share/chromium \
33+
/usr/local/share/powershell \
34+
/usr/share/dotnet \
35+
/usr/share/swift
36+
echo "Disk space after cleanup..."
37+
df -h /
38+
displayName: "Clean up disk space"
39+
40+
- script: |
41+
set -e
42+
echo "=== Disk space BEFORE make image ==="
43+
df -h
1944
if [ ${{ parameters.os }} = 'windows' ]; then export BUILDX_ACTION='--push'; fi
45+
2046
make ${{ parameters.name }}-image OS=${{ parameters.os }} ARCH=${{ parameters.arch }} OS_VERSION=${{ parameters.os_version }}
47+
48+
echo "=== Disk space AFTER make image ==="
49+
df -h
2150
name: image_build
2251
displayName: Image Build
23-
retryCountOnTaskFailure: 3
52+
retryCountOnTaskFailure: 2
2453

2554
- task: AzureCLI@2
2655
displayName: "Logout"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ stages:
6969
dependsOn: ${{ parameters.name }}
7070
datapath: true
7171
dns: true
72-
portforward: true
72+
portforward: ${{ eq(parameters.os, 'linux') }} # Unblock Pipeline, broken for all windows scenarios
7373
hostport: true
7474
service: true
7575

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ stages:
7373
os: ${{ parameters.os }}
7474
datapath: true
7575
dns: true
76-
portforward: true
76+
portforward: ${{ eq(parameters.os, 'linux') }} # Unblock Pipeline, broken for all windows scenarios
7777
hybridWin: true
7878
service: true
7979
hostport: true

.pipelines/singletenancy/azure-cni-overlay/azure-cni-overlay-e2e-job-template.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ stages:
111111
dependsOn: ${{ parameters.name }}_windows
112112
datapath: true
113113
dns: true
114-
portforward: true
114+
portforward: ${{ eq(parameters.os, 'linux') }} # Unblock Pipeline, broken for all windows scenarios
115115
hostport: true
116116
service: true
117117

@@ -123,7 +123,7 @@ stages:
123123
dependsOn: cni_${{ parameters.os }}
124124
datapath: true
125125
dns: true
126-
portforward: true
126+
portforward: false # Unblock Pipeline, broken for all windows scenarios
127127
hostport: true
128128
service: true
129129
hybridWin: true

.pipelines/singletenancy/dualstack-overlay/dualstackoverlay-e2e-job-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ stages:
123123
dependsOn: cni_linux
124124
# dualstack: true # Currently broken for scenario and blocking releases, HNS is investigating. Covered by go test in E2E step template
125125
dns: true
126-
portforward: true
126+
portforward: false # Unblock Pipeline, broken for all windows scenarios
127127
# service: true # Currently broken for scenario and blocking releases, HNS is investigating.
128128
hostport: true
129129
hybridWin: true

0 commit comments

Comments
 (0)