Skip to content

Commit 0b65001

Browse files
ci: Output AIB release notes and cgmanifest to customization.log (#263)
* Output windows image builder containerd image pull notes and release notes * Add linux release notes and cgmanifest * Clean up * Remove validation from release.yaml, use ADO instead
1 parent ef71a7a commit 0b65001

File tree

4 files changed

+32
-77
lines changed

4 files changed

+32
-77
lines changed

.github/workflows/release.yaml

Lines changed: 0 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -7,36 +7,8 @@ on:
77
paths:
88
- 'releases/CHANGELOG*.md'
99

10-
env:
11-
LINUX_NODE_IMAGE_SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
12-
LINUX_NODE_IMAGE_RESOURCE_GROUP: ${{vars.LINUX_NODE_IMAGE_RESOURCE_GROUP}}
13-
LINUX_NODE_IMAGE_GALLERY: ${{vars.LINUX_NODE_IMAGE_GALLERY}}
14-
LINUX_NODE_IMAGE_NAME: ${{vars.LINUX_NODE_IMAGE_NAME}}
15-
LINUX_NODE_IMAGE_VERSION: 2024.032.1
16-
WINDOWS_NODE_IMAGE_SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
17-
WINDOWS_NODE_IMAGE_RESOURCE_GROUP: ${{vars.WINDOWS_NODE_IMAGE_RESOURCE_GROUP}}
18-
WINDOWS_NODE_IMAGE_GALLERY: ${{vars.WINDOWS_NODE_IMAGE_GALLERY}}
19-
WINDOWS_NODE_IMAGE_NAME: ${{vars.WINDOWS_NODE_IMAGE_NAME}}
20-
WINDOWS_NODE_IMAGE_VERSION: 2024.032.1
21-
2210
jobs:
23-
sig_image_versions:
24-
runs-on: ubuntu-latest
25-
outputs:
26-
LINUX_NODE_IMAGE_VERSION: ${{ env.LINUX_NODE_IMAGE_VERSION }}
27-
WINDOWS_NODE_IMAGE_VERSION: ${{ env.WINDOWS_NODE_IMAGE_VERSION }}
28-
steps:
29-
- run: echo "Exposing sig image version variables"
30-
validate-no-egress:
31-
needs: sig_image_versions
32-
uses: ./.github/workflows/test-vhd-no-egress.yaml
33-
with:
34-
from_branch: ''
35-
LINUX_NODE_IMAGE_VERSION: ${{ needs.sig_image_versions.outputs.LINUX_NODE_IMAGE_VERSION }}
36-
WINDOWS_NODE_IMAGE_VERSION: ${{ needs.sig_image_versions.outputs.WINDOWS_NODE_IMAGE_VERSION }}
37-
secrets: inherit
3811
build:
39-
needs: validate-no-egress
4012
runs-on: ubuntu-latest
4113
permissions:
4214
contents: write
@@ -80,54 +52,6 @@ jobs:
8052
- name: print git status after build
8153
run: |
8254
git status
83-
- name: Validate 1.27 + containerd E2E
84-
env:
85-
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
86-
ORCHESTRATOR_RELEASE: "1.27"
87-
CLUSTER_DEFINITION: "examples/e2e-tests/kubernetes/release/default/definition.json"
88-
SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
89-
CLIENT_ID: ${{ secrets.TEST_AZURE_SP_ID }}
90-
CLIENT_SECRET: ${{ secrets.TEST_AZURE_SP_PW }}
91-
LOCATION: "eastus"
92-
TENANT_ID: ${{ secrets.TEST_AZURE_TENANT_ID }}
93-
USE_MANAGED_IDENTITY: true
94-
MSI_USER_ASSIGNED_ID: ${{ secrets.MSI_USER_ASSIGNED_ID_AKS_ENGINE_E2E }}
95-
CREATE_VNET: true
96-
CLEANUP_ON_EXIT: true
97-
CLEANUP_IF_FAIL: true
98-
GINKGO_SKIP: ""
99-
STABILITY_ITERATIONS: "0"
100-
RETAIN_SSH: false
101-
CONTAINER_RUNTIME: "containerd"
102-
BLOCK_SSH: true
103-
SKIP_LOGS_COLLECTION: true
104-
AZURE_CORE_ONLY_SHOW_ERRORS: true
105-
DISTRO: "aks-ubuntu-20.04"
106-
run: make test-kubernetes
107-
- name: Validate 1.28 + containerd E2E
108-
env:
109-
SSH_AUTH_SOCK: /tmp/ssh_agent.sock
110-
ORCHESTRATOR_RELEASE: "1.28"
111-
CLUSTER_DEFINITION: "examples/e2e-tests/kubernetes/release/default/definition.json"
112-
SUBSCRIPTION_ID: ${{ secrets.TEST_AZURE_SUB_ID }}
113-
CLIENT_ID: ${{ secrets.TEST_AZURE_SP_ID }}
114-
CLIENT_SECRET: ${{ secrets.TEST_AZURE_SP_PW }}
115-
LOCATION: "eastus"
116-
TENANT_ID: ${{ secrets.TEST_AZURE_TENANT_ID }}
117-
USE_MANAGED_IDENTITY: true
118-
MSI_USER_ASSIGNED_ID: ${{ secrets.MSI_USER_ASSIGNED_ID_AKS_ENGINE_E2E }}
119-
CREATE_VNET: true
120-
CLEANUP_ON_EXIT: true
121-
CLEANUP_IF_FAIL: true
122-
GINKGO_SKIP: ""
123-
STABILITY_ITERATIONS: "0"
124-
RETAIN_SSH: false
125-
CONTAINER_RUNTIME: "containerd"
126-
BLOCK_SSH: true
127-
SKIP_LOGS_COLLECTION: true
128-
AZURE_CORE_ONLY_SHOW_ERRORS: true
129-
DISTRO: "aks-ubuntu-20.04"
130-
run: make test-kubernetes
13155
- name: Remove untracked files created during workflow steps
13256
run: git ls-files --others --exclude-standard -z | xargs -0 -r rm
13357
- name: Add local tag

vhd/packer/configure-windows-vhd-phase2.ps1

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,14 @@ function Get-ContainerImages {
4848
# CSE will configure and register containerd as a service at deployment time
4949
Start-Job -Name containerd -ScriptBlock { containerd.exe }
5050
foreach ($image in $imagesToPull) {
51-
& ctr.exe -n k8s.io images pull $image > $containerdImagePullNotesFilePath
51+
& ctr.exe -n k8s.io images pull $image >> $containerdImagePullNotesFilePath
5252
}
53+
Write-Log "Begin listing containerd images"
54+
$imagesList = & ctr.exe -n k8s.io images list
55+
foreach ($line in $imagesList) {
56+
Write-Output $line
57+
}
58+
Write-Log "End listing containerd images"
5359
Stop-Job -Name containerd
5460
Remove-Job -Name containerd
5561
}

vhd/packer/install-dependencies.sh

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -443,3 +443,17 @@ apt list --installed \
443443
}
444444
))
445445
}' > ${VHD_CG_MANIFEST}
446+
447+
output_file_contents() {
448+
local filepath=$1
449+
450+
if [ -f "$filepath" ]; then
451+
echo "===== Begin contents of $filepath ====="
452+
cat "$filepath"
453+
echo "===== End contents of $filepath ====="
454+
else
455+
echo "File not found: $filepath"
456+
fi
457+
}
458+
output_file_contents "$VHD_LOGS_FILEPATH"
459+
output_file_contents "$VHD_CG_MANIFEST"

vhd/packer/write-release-notes-windows.ps1

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,3 +123,14 @@ Log ($displayObjects | Format-Table -Property File, Sha256, SizeBytes | Out-Stri
123123

124124
# Ensure proper encoding is set for release notes file
125125
[IO.File]::ReadAllText($releaseNotesFilePath) | Out-File -Encoding utf8 $releaseNotesFilePath
126+
127+
if (Test-Path $releaseNotesFilePath) {
128+
$fileContent = Get-Content $releaseNotesFilePath
129+
Write-Output "===== Begin contents of $releaseNotesFilePath ====="
130+
foreach ($line in $fileContent) {
131+
Write-Output $line
132+
}
133+
Write-Output "===== End contents of $releaseNotesFilePath ====="
134+
} else {
135+
Write-Output "File not found: $releaseNotesFilePath"
136+
}

0 commit comments

Comments
 (0)