From c319d86746c645da01361152fd9f3ed60ebd2ff6 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 6 Mar 2025 05:00:15 +0000 Subject: [PATCH 01/18] create new action --- .../check-windows-packages-change.yml | 74 +++++++++++++++++++ .github/workflows/validate-windows-ut.yml | 59 --------------- 2 files changed, 74 insertions(+), 59 deletions(-) create mode 100644 .github/workflows/check-windows-packages-change.yml diff --git a/.github/workflows/check-windows-packages-change.yml b/.github/workflows/check-windows-packages-change.yml new file mode 100644 index 00000000000..c8510501869 --- /dev/null +++ b/.github/workflows/check-windows-packages-change.yml @@ -0,0 +1,74 @@ +name: Make windows components change PR review comment +on: pull_request + +jobs: + compare-components-output: + name: Compare components.json and windows_settings.json for each windows VHD + runs-on: windows-latest + permissions: + pull-requests: write + steps: + - name: Check out repository code + uses: actions/checkout@v4 + with: + ref: master + path: master + fetch-depth: 1 + + - name: Check out repository code + uses: actions/checkout@v4 + with: + path: pr + fetch-depth: 1 + + - name: Produce vhd files - master + shell: pwsh + run: | + cd pr + mkdir vhd_files + + pwsh -c vhdbuilder/scripts/windows/generate_cached_stuff_list.ps1 vhd_files vhdbuilder/packer/windows/components_json_helpers.ps1 ../master/vhdbuilder/packer/windows/windows_settings.json ../master/parts/common/components.json + + git add vhd_files + git config user.email "you@example.com" + git config user.name "Your Name" + git commit -m "versions of files from master" + + pwsh -c vhdbuilder/scripts/windows/generate_cached_stuff_list.ps1 vhd_files vhdbuilder/packer/windows/components_json_helpers.ps1 vhdbuilder/packer/windows/windows_settings.json parts/common/components.json + + mkdir -p ../.github/workflows + $diffFile = "../.github/workflows/diff.md" + + git diff --quiet + if ( $LASTEXITCODE -eq "0" ) { + Write-Output "No changes to cached containers or packages on Windows VHDs" > $diffFile + echo "IsDifference=0" >> $GITHUB_ENV + } else { + echo "IsDifference=1" >> $GITHUB_ENV + Write-Output "Changes cached containers or packages on windows VHDs" > $diffFile + Write-Output "" >> $diffFile + Write-Output '```diff' >> $diffFile + git diff >> $diffFile + Write-Output '```' >> $diffFile + } + + dir $diffFile + Get-Content $diffFile + + - name: Add comment to PR + uses: thollander/actions-comment-pull-request@v3 + if: ${{ env.IsDifference == 1 }} + with: + file-path: "diff.md" + comment-tag: "WINDOWS_VHD_CONTENT_DIFF" + env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + + - name: remove comment from PR + uses: thollander/actions-comment-pull-request@v3 + if: ${{ env.IsDifference == 0 }} + with: + mode: delete + comment-tag: "WINDOWS_VHD_CONTENT_DIFF" + env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file diff --git a/.github/workflows/validate-windows-ut.yml b/.github/workflows/validate-windows-ut.yml index f681f547323..36d989a27db 100644 --- a/.github/workflows/validate-windows-ut.yml +++ b/.github/workflows/validate-windows-ut.yml @@ -23,62 +23,3 @@ jobs: run: | Install-Module -Name powershell-yaml -Force Invoke-Pester staging/cse/windows/*.tests.ps1 -Passthru - - compare-components-output: - name: Compare components.json for each windows VHD - runs-on: windows-latest - permissions: - pull-requests: write - steps: - - name: Check out repository code - uses: actions/checkout@v4 - with: - ref: master - path: master - fetch-depth: 1 - - - name: Check out repository code - uses: actions/checkout@v4 - with: - path: pr - fetch-depth: 1 - - - name: Produce vhd files - master - shell: pwsh - run: | - cd pr - mkdir vhd_files - - pwsh -c vhdbuilder/scripts/windows/generate_cached_stuff_list.ps1 vhd_files vhdbuilder/packer/windows/components_json_helpers.ps1 ../master/vhdbuilder/packer/windows/windows_settings.json ../master/parts/common/components.json - - git add vhd_files - git config user.email "you@example.com" - git config user.name "Your Name" - git commit -m "versions of files from master" - - pwsh -c vhdbuilder/scripts/windows/generate_cached_stuff_list.ps1 vhd_files vhdbuilder/packer/windows/components_json_helpers.ps1 vhdbuilder/packer/windows/windows_settings.json parts/common/components.json - - mkdir -p ../.github/workflows - $diffFile = "../.github/workflows/diff.md" - - git diff --quiet - if ( $LASTEXITCODE -eq "0" ) { - Write-Output "No changes to cached containers or packages on Windows VHDs" > $diffFile - } else { - Write-Output "Changes cached containers or packages on windows VHDs" > $diffFile - Write-Output "" >> $diffFile - Write-Output '```diff' >> $diffFile - git diff >> $diffFile - Write-Output '```' >> $diffFile - } - - dir $diffFile - Get-Content $diffFile - - - name: Add comment to PR - uses: NejcZdovc/comment-pr@v2 - with: - file: "diff.md" - identifier: "WINDOWS_VHD_CONTENT_DIFF" - env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file From 82b4c20d06e2faf8f3af487c7f8036838bad6a03 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 6 Mar 2025 05:00:51 +0000 Subject: [PATCH 02/18] change components.json --- parts/common/components.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/parts/common/components.json b/parts/common/components.json index 0aa10a782f6..9d186ee1aad 100644 --- a/parts/common/components.json +++ b/parts/common/components.json @@ -5,11 +5,6 @@ "amd64OnlyVersions": [], "multiArchVersionsV2": [], "windowsVersions": [ - { - "renovateTag": "registry=https://mcr.microsoft.com, name=windows/servercore", - "latestVersion": "ltsc2019", - "windowsSkuMatch": "2019-containerd" - }, { "renovateTag": "registry=https://mcr.microsoft.com, name=windows/servercore", "latestVersion": "ltsc2022", From 6f8aad565f0edb3114ea51d7849dc0ba8cd4dd72 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 6 Mar 2025 05:04:58 +0000 Subject: [PATCH 03/18] don't build VHD prs while I'm testing --- .github/workflows/check-windows-packages-change.yml | 4 ++-- .pipelines/.vsts-vhd-builder-pr-windows.yaml | 1 + .pipelines/.vsts-vhd-builder.yaml | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-windows-packages-change.yml b/.github/workflows/check-windows-packages-change.yml index c8510501869..ac49059ef04 100644 --- a/.github/workflows/check-windows-packages-change.yml +++ b/.github/workflows/check-windows-packages-change.yml @@ -57,7 +57,7 @@ jobs: - name: Add comment to PR uses: thollander/actions-comment-pull-request@v3 - if: ${{ env.IsDifference == 1 }} + if: ${{ env.IsDifference == '1' }} with: file-path: "diff.md" comment-tag: "WINDOWS_VHD_CONTENT_DIFF" @@ -66,7 +66,7 @@ jobs: - name: remove comment from PR uses: thollander/actions-comment-pull-request@v3 - if: ${{ env.IsDifference == 0 }} + if: ${{ env.IsDifference == '0' }} with: mode: delete comment-tag: "WINDOWS_VHD_CONTENT_DIFF" diff --git a/.pipelines/.vsts-vhd-builder-pr-windows.yaml b/.pipelines/.vsts-vhd-builder-pr-windows.yaml index 0a348ffa91b..10881bde0af 100644 --- a/.pipelines/.vsts-vhd-builder-pr-windows.yaml +++ b/.pipelines/.vsts-vhd-builder-pr-windows.yaml @@ -33,6 +33,7 @@ pr: - /**/*.md - .github/** - e2e/scenario_test.go + - parts/common/components.json pool: name: $(AZURE_POOL_NAME) diff --git a/.pipelines/.vsts-vhd-builder.yaml b/.pipelines/.vsts-vhd-builder.yaml index 48921c5272f..4ef95807cc5 100644 --- a/.pipelines/.vsts-vhd-builder.yaml +++ b/.pipelines/.vsts-vhd-builder.yaml @@ -30,6 +30,8 @@ pr: - /**/*.md - .github/** - e2e/scenario_win_test.go + - parts/common/components.json + pool: name: $(POOL_NAME) From d6d26a6b12e9b27572ab7162828d4edaeb047539 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 6 Mar 2025 05:08:37 +0000 Subject: [PATCH 04/18] use actions --- .github/workflows/check-windows-packages-change.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-windows-packages-change.yml b/.github/workflows/check-windows-packages-change.yml index ac49059ef04..33557169a5f 100644 --- a/.github/workflows/check-windows-packages-change.yml +++ b/.github/workflows/check-windows-packages-change.yml @@ -42,9 +42,9 @@ jobs: git diff --quiet if ( $LASTEXITCODE -eq "0" ) { Write-Output "No changes to cached containers or packages on Windows VHDs" > $diffFile - echo "IsDifference=0" >> $GITHUB_ENV + echo "\nCommentAction=delete\n" >> $GITHUB_ENV } else { - echo "IsDifference=1" >> $GITHUB_ENV + echo "\nCommentAction=create\n" >> $GITHUB_ENV Write-Output "Changes cached containers or packages on windows VHDs" > $diffFile Write-Output "" >> $diffFile Write-Output '```diff' >> $diffFile @@ -57,7 +57,7 @@ jobs: - name: Add comment to PR uses: thollander/actions-comment-pull-request@v3 - if: ${{ env.IsDifference == '1' }} + if: ${{ env.CommentAction == 'create' }} with: file-path: "diff.md" comment-tag: "WINDOWS_VHD_CONTENT_DIFF" @@ -66,7 +66,7 @@ jobs: - name: remove comment from PR uses: thollander/actions-comment-pull-request@v3 - if: ${{ env.IsDifference == '0' }} + if: ${{ env.CommentAction == 'delete' }} with: mode: delete comment-tag: "WINDOWS_VHD_CONTENT_DIFF" From 85703ab3ff31510c8f43f9a9fb91991c5d590e0c Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 6 Mar 2025 05:10:35 +0000 Subject: [PATCH 05/18] less triggers --- .../check-windows-packages-change.yml | 4 ++-- .pipelines/.vsts-vhd-builder-pr-windows.yaml | 20 ------------------- .pipelines/.vsts-vhd-builder.yaml | 11 ---------- 3 files changed, 2 insertions(+), 33 deletions(-) diff --git a/.github/workflows/check-windows-packages-change.yml b/.github/workflows/check-windows-packages-change.yml index 33557169a5f..6753fedb79b 100644 --- a/.github/workflows/check-windows-packages-change.yml +++ b/.github/workflows/check-windows-packages-change.yml @@ -42,9 +42,9 @@ jobs: git diff --quiet if ( $LASTEXITCODE -eq "0" ) { Write-Output "No changes to cached containers or packages on Windows VHDs" > $diffFile - echo "\nCommentAction=delete\n" >> $GITHUB_ENV + echo "CommentAction=delete" >> $GITHUB_ENV } else { - echo "\nCommentAction=create\n" >> $GITHUB_ENV + echo "CommentAction=create" >> $GITHUB_ENV Write-Output "Changes cached containers or packages on windows VHDs" > $diffFile Write-Output "" >> $diffFile Write-Output '```diff' >> $diffFile diff --git a/.pipelines/.vsts-vhd-builder-pr-windows.yaml b/.pipelines/.vsts-vhd-builder-pr-windows.yaml index 10881bde0af..79a40d0b0fa 100644 --- a/.pipelines/.vsts-vhd-builder-pr-windows.yaml +++ b/.pipelines/.vsts-vhd-builder-pr-windows.yaml @@ -7,26 +7,6 @@ pr: - dev paths: include: - - .pipelines/.vsts-vhd-builder-release-windows.yaml - - .pipelines/.vsts-vhd-builder-pr-windows.yaml - - .pipelines/templates/.template-override-components-json.yaml - - .pipelines/templates/.template-copy-file.yaml - - .pipelines/templates/.build-and-test-windows-vhds-template.yaml - - .pipelines/templates/.build-and-test-windows-vhd-template.yaml - - .pipelines/templates/.builder-release-template-windows.yaml - - .pipelines/templates/e2e-template.yaml - - packer.mk - - vhdbuilder/packer/packer-plugin.pkr.hcl - - vhdbuilder/packer/*.ps1 - - vhdbuilder/packer/test/*.ps1 - - vhdbuilder/packer/test/run-test.sh - - vhdbuilder/packer/backfill-cleanup.sh - - vhdbuilder/packer/cleanup.sh - - vhdbuilder/packer/convert-sig-to-classic-storage-account-blob.sh - - vhdbuilder/packer/generate-vhd-publishing-info.sh - - vhdbuilder/packer/init-variables.sh - - vhdbuilder/packer/windows/ - - parts/common/components.json - parts/windows exclude: - vhdbuilder/release-notes diff --git a/.pipelines/.vsts-vhd-builder.yaml b/.pipelines/.vsts-vhd-builder.yaml index 4ef95807cc5..831bc76874c 100644 --- a/.pipelines/.vsts-vhd-builder.yaml +++ b/.pipelines/.vsts-vhd-builder.yaml @@ -8,17 +8,6 @@ pr: paths: include: - schemas - - vhdbuilder/packer - - vhdbuilder/scripts/linux - - .pipelines/.vsts-vhd-builder.yaml - - .pipelines/templates/.builder-release-template.yaml - - .pipelines/templates/.template-override-components-json.yaml - - .pipelines/templates/.template-copy-file.yaml - - .pipelines/templates/e2e-template.yaml - - parts/linux/* - - packer.mk - - aks-node-controller/** - - parts/common/components.json exclude: - schemas/windows_settings.cue - vhdbuilder/release-notes From 27d6729c0612c789a1b10dcb56ca57699cec3072 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 6 Mar 2025 05:14:53 +0000 Subject: [PATCH 06/18] use step outputs --- .github/workflows/check-windows-packages-change.yml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/.github/workflows/check-windows-packages-change.yml b/.github/workflows/check-windows-packages-change.yml index 6753fedb79b..3eb7500e714 100644 --- a/.github/workflows/check-windows-packages-change.yml +++ b/.github/workflows/check-windows-packages-change.yml @@ -7,6 +7,8 @@ jobs: runs-on: windows-latest permissions: pull-requests: write + outputs: + output1: ${{ steps.makeDiff.outputs.commentAction }} steps: - name: Check out repository code uses: actions/checkout@v4 @@ -22,6 +24,7 @@ jobs: fetch-depth: 1 - name: Produce vhd files - master + id: makeDiff shell: pwsh run: | cd pr @@ -42,9 +45,9 @@ jobs: git diff --quiet if ( $LASTEXITCODE -eq "0" ) { Write-Output "No changes to cached containers or packages on Windows VHDs" > $diffFile - echo "CommentAction=delete" >> $GITHUB_ENV + echo "commentAction=delete" >> $GITHUB_OUTPUT } else { - echo "CommentAction=create" >> $GITHUB_ENV + echo "commentAction=create" >> $GITHUB_OUTPUT Write-Output "Changes cached containers or packages on windows VHDs" > $diffFile Write-Output "" >> $diffFile Write-Output '```diff' >> $diffFile @@ -57,7 +60,7 @@ jobs: - name: Add comment to PR uses: thollander/actions-comment-pull-request@v3 - if: ${{ env.CommentAction == 'create' }} + if: ${{ steps.makeDiff.outputs.commentAction == 'create' }} with: file-path: "diff.md" comment-tag: "WINDOWS_VHD_CONTENT_DIFF" @@ -66,7 +69,7 @@ jobs: - name: remove comment from PR uses: thollander/actions-comment-pull-request@v3 - if: ${{ env.CommentAction == 'delete' }} + if: ${{ steps.makeDiff.outputs.commentAction == 'delete' }} with: mode: delete comment-tag: "WINDOWS_VHD_CONTENT_DIFF" From bc9d14bb1683c4af5e70537739ee5afe4b2fef23 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 6 Mar 2025 05:17:58 +0000 Subject: [PATCH 07/18] comment action --- .github/workflows/check-windows-packages-change.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-windows-packages-change.yml b/.github/workflows/check-windows-packages-change.yml index 3eb7500e714..372956fd2ae 100644 --- a/.github/workflows/check-windows-packages-change.yml +++ b/.github/workflows/check-windows-packages-change.yml @@ -8,7 +8,7 @@ jobs: permissions: pull-requests: write outputs: - output1: ${{ steps.makeDiff.outputs.commentAction }} + commentAction: ${{ steps.makeDiff.outputs.commentAction }} steps: - name: Check out repository code uses: actions/checkout@v4 @@ -57,6 +57,9 @@ jobs: dir $diffFile Get-Content $diffFile + + Write-Output "github output" + Get-Content $GITHUB_OUTPUT - name: Add comment to PR uses: thollander/actions-comment-pull-request@v3 From 0421937d1466fe14412265584c1a922552fa33dc Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 6 Mar 2025 05:20:00 +0000 Subject: [PATCH 08/18] don't echo --- .../check-windows-packages-change.yml | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/.github/workflows/check-windows-packages-change.yml b/.github/workflows/check-windows-packages-change.yml index 372956fd2ae..7b8b4d015f4 100644 --- a/.github/workflows/check-windows-packages-change.yml +++ b/.github/workflows/check-windows-packages-change.yml @@ -7,8 +7,6 @@ jobs: runs-on: windows-latest permissions: pull-requests: write - outputs: - commentAction: ${{ steps.makeDiff.outputs.commentAction }} steps: - name: Check out repository code uses: actions/checkout@v4 @@ -38,16 +36,14 @@ jobs: git commit -m "versions of files from master" pwsh -c vhdbuilder/scripts/windows/generate_cached_stuff_list.ps1 vhd_files vhdbuilder/packer/windows/components_json_helpers.ps1 vhdbuilder/packer/windows/windows_settings.json parts/common/components.json - - mkdir -p ../.github/workflows - $diffFile = "../.github/workflows/diff.md" + + $diffFile = "diff.md" + $noDiffFile = "no_diff.md" git diff --quiet if ( $LASTEXITCODE -eq "0" ) { - Write-Output "No changes to cached containers or packages on Windows VHDs" > $diffFile - echo "commentAction=delete" >> $GITHUB_OUTPUT + Write-Output "No changes to cached containers or packages on Windows VHDs" > $noDiffFile } else { - echo "commentAction=create" >> $GITHUB_OUTPUT Write-Output "Changes cached containers or packages on windows VHDs" > $diffFile Write-Output "" >> $diffFile Write-Output '```diff' >> $diffFile @@ -57,13 +53,10 @@ jobs: dir $diffFile Get-Content $diffFile - - Write-Output "github output" - Get-Content $GITHUB_OUTPUT - name: Add comment to PR uses: thollander/actions-comment-pull-request@v3 - if: ${{ steps.makeDiff.outputs.commentAction == 'create' }} + if: ${{ hashFiles('diff.md') != '' }} with: file-path: "diff.md" comment-tag: "WINDOWS_VHD_CONTENT_DIFF" @@ -72,7 +65,7 @@ jobs: - name: remove comment from PR uses: thollander/actions-comment-pull-request@v3 - if: ${{ steps.makeDiff.outputs.commentAction == 'delete' }} + if: ${{ hashFiles('nodiff.md') != '' }} with: mode: delete comment-tag: "WINDOWS_VHD_CONTENT_DIFF" From 6e20c099ae6eacc0708e576d12ca247bdc0b5bbe Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 6 Mar 2025 05:21:29 +0000 Subject: [PATCH 09/18] don't try to delete --- .../workflows/check-windows-packages-change.yml | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/.github/workflows/check-windows-packages-change.yml b/.github/workflows/check-windows-packages-change.yml index 7b8b4d015f4..f176f1124da 100644 --- a/.github/workflows/check-windows-packages-change.yml +++ b/.github/workflows/check-windows-packages-change.yml @@ -38,11 +38,9 @@ jobs: pwsh -c vhdbuilder/scripts/windows/generate_cached_stuff_list.ps1 vhd_files vhdbuilder/packer/windows/components_json_helpers.ps1 vhdbuilder/packer/windows/windows_settings.json parts/common/components.json $diffFile = "diff.md" - $noDiffFile = "no_diff.md" - git diff --quiet if ( $LASTEXITCODE -eq "0" ) { - Write-Output "No changes to cached containers or packages on Windows VHDs" > $noDiffFile + Write-Output "No changes to cached containers or packages on Windows VHDs" > $diffFile } else { Write-Output "Changes cached containers or packages on windows VHDs" > $diffFile Write-Output "" >> $diffFile @@ -56,18 +54,8 @@ jobs: - name: Add comment to PR uses: thollander/actions-comment-pull-request@v3 - if: ${{ hashFiles('diff.md') != '' }} with: file-path: "diff.md" comment-tag: "WINDOWS_VHD_CONTENT_DIFF" env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - - - name: remove comment from PR - uses: thollander/actions-comment-pull-request@v3 - if: ${{ hashFiles('nodiff.md') != '' }} - with: - mode: delete - comment-tag: "WINDOWS_VHD_CONTENT_DIFF" - env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file From 315e8b52ea587cbf4a06fb4b590dd86b389f8f05 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 6 Mar 2025 05:23:15 +0000 Subject: [PATCH 10/18] wrong dir --- .github/workflows/check-windows-packages-change.yml | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-windows-packages-change.yml b/.github/workflows/check-windows-packages-change.yml index f176f1124da..914bba31c80 100644 --- a/.github/workflows/check-windows-packages-change.yml +++ b/.github/workflows/check-windows-packages-change.yml @@ -37,7 +37,7 @@ jobs: pwsh -c vhdbuilder/scripts/windows/generate_cached_stuff_list.ps1 vhd_files vhdbuilder/packer/windows/components_json_helpers.ps1 vhdbuilder/packer/windows/windows_settings.json parts/common/components.json - $diffFile = "diff.md" + $diffFile = "../diff.md" git diff --quiet if ( $LASTEXITCODE -eq "0" ) { Write-Output "No changes to cached containers or packages on Windows VHDs" > $diffFile @@ -54,8 +54,18 @@ jobs: - name: Add comment to PR uses: thollander/actions-comment-pull-request@v3 + if: ${{ hashFiles('diff.md') != '' }} with: file-path: "diff.md" comment-tag: "WINDOWS_VHD_CONTENT_DIFF" env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} + + - name: remove comment from PR + uses: thollander/actions-comment-pull-request@v3 + if: ${{ hashFiles('nodiff.md') != '' }} + with: + mode: delete + comment-tag: "WINDOWS_VHD_CONTENT_DIFF" + env: + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file From 70dbd6644da3ceceef0bb15feb201d3fb6dc0efd Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 6 Mar 2025 05:23:47 +0000 Subject: [PATCH 11/18] nodiff --- .github/workflows/check-windows-packages-change.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/check-windows-packages-change.yml b/.github/workflows/check-windows-packages-change.yml index 914bba31c80..e780c5eac50 100644 --- a/.github/workflows/check-windows-packages-change.yml +++ b/.github/workflows/check-windows-packages-change.yml @@ -38,9 +38,10 @@ jobs: pwsh -c vhdbuilder/scripts/windows/generate_cached_stuff_list.ps1 vhd_files vhdbuilder/packer/windows/components_json_helpers.ps1 vhdbuilder/packer/windows/windows_settings.json parts/common/components.json $diffFile = "../diff.md" + $noDiffFile = "../nodiff.md" git diff --quiet if ( $LASTEXITCODE -eq "0" ) { - Write-Output "No changes to cached containers or packages on Windows VHDs" > $diffFile + Write-Output "No changes to cached containers or packages on Windows VHDs" > $noDiffFile } else { Write-Output "Changes cached containers or packages on windows VHDs" > $diffFile Write-Output "" >> $diffFile From 474de30a8b38876d249ef36ea1f2194357544526 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 6 Mar 2025 05:31:43 +0000 Subject: [PATCH 12/18] revert components.json --- parts/common/components.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/parts/common/components.json b/parts/common/components.json index 9d186ee1aad..0aa10a782f6 100644 --- a/parts/common/components.json +++ b/parts/common/components.json @@ -5,6 +5,11 @@ "amd64OnlyVersions": [], "multiArchVersionsV2": [], "windowsVersions": [ + { + "renovateTag": "registry=https://mcr.microsoft.com, name=windows/servercore", + "latestVersion": "ltsc2019", + "windowsSkuMatch": "2019-containerd" + }, { "renovateTag": "registry=https://mcr.microsoft.com, name=windows/servercore", "latestVersion": "ltsc2022", From 970352703e3fd147560c0ba905b2675d25a7be48 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 6 Mar 2025 05:32:55 +0000 Subject: [PATCH 13/18] fix script --- .github/workflows/check-windows-packages-change.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/check-windows-packages-change.yml b/.github/workflows/check-windows-packages-change.yml index e780c5eac50..09949000e72 100644 --- a/.github/workflows/check-windows-packages-change.yml +++ b/.github/workflows/check-windows-packages-change.yml @@ -48,10 +48,10 @@ jobs: Write-Output '```diff' >> $diffFile git diff >> $diffFile Write-Output '```' >> $diffFile - } - dir $diffFile - Get-Content $diffFile + dir $diffFile + Get-Content $diffFile + } - name: Add comment to PR uses: thollander/actions-comment-pull-request@v3 From 05f22c6405e0ec80f40eaa215919406cedc4d7cb Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 6 Mar 2025 05:38:02 +0000 Subject: [PATCH 14/18] fix --- .../check-windows-packages-change.yml | 17 +++++++-------- .pipelines/.vsts-vhd-builder-pr-windows.yaml | 21 ++++++++++++++++++- .pipelines/.vsts-vhd-builder.yaml | 13 ++++++++++-- 3 files changed, 39 insertions(+), 12 deletions(-) diff --git a/.github/workflows/check-windows-packages-change.yml b/.github/workflows/check-windows-packages-change.yml index 09949000e72..6bbdc63dcaa 100644 --- a/.github/workflows/check-windows-packages-change.yml +++ b/.github/workflows/check-windows-packages-change.yml @@ -38,10 +38,9 @@ jobs: pwsh -c vhdbuilder/scripts/windows/generate_cached_stuff_list.ps1 vhd_files vhdbuilder/packer/windows/components_json_helpers.ps1 vhdbuilder/packer/windows/windows_settings.json parts/common/components.json $diffFile = "../diff.md" - $noDiffFile = "../nodiff.md" git diff --quiet if ( $LASTEXITCODE -eq "0" ) { - Write-Output "No changes to cached containers or packages on Windows VHDs" > $noDiffFile + Write-Output "No changes to cached containers or packages on Windows VHDs" > $diffFile } else { Write-Output "Changes cached containers or packages on windows VHDs" > $diffFile Write-Output "" >> $diffFile @@ -53,20 +52,20 @@ jobs: Get-Content $diffFile } - - name: Add comment to PR + - name: remove comment from PR + # Removing and then adding the comment means that the comment will always appear at the bottom of the PR. uses: thollander/actions-comment-pull-request@v3 - if: ${{ hashFiles('diff.md') != '' }} with: - file-path: "diff.md" + mode: delete comment-tag: "WINDOWS_VHD_CONTENT_DIFF" env: GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} - - name: remove comment from PR + - name: Add comment to PR uses: thollander/actions-comment-pull-request@v3 - if: ${{ hashFiles('nodiff.md') != '' }} + if: ${{ hashFiles('diff.md') != '' }} with: - mode: delete + file-path: "diff.md" comment-tag: "WINDOWS_VHD_CONTENT_DIFF" env: - GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} \ No newline at end of file + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.pipelines/.vsts-vhd-builder-pr-windows.yaml b/.pipelines/.vsts-vhd-builder-pr-windows.yaml index 79a40d0b0fa..0a348ffa91b 100644 --- a/.pipelines/.vsts-vhd-builder-pr-windows.yaml +++ b/.pipelines/.vsts-vhd-builder-pr-windows.yaml @@ -7,13 +7,32 @@ pr: - dev paths: include: + - .pipelines/.vsts-vhd-builder-release-windows.yaml + - .pipelines/.vsts-vhd-builder-pr-windows.yaml + - .pipelines/templates/.template-override-components-json.yaml + - .pipelines/templates/.template-copy-file.yaml + - .pipelines/templates/.build-and-test-windows-vhds-template.yaml + - .pipelines/templates/.build-and-test-windows-vhd-template.yaml + - .pipelines/templates/.builder-release-template-windows.yaml + - .pipelines/templates/e2e-template.yaml + - packer.mk + - vhdbuilder/packer/packer-plugin.pkr.hcl + - vhdbuilder/packer/*.ps1 + - vhdbuilder/packer/test/*.ps1 + - vhdbuilder/packer/test/run-test.sh + - vhdbuilder/packer/backfill-cleanup.sh + - vhdbuilder/packer/cleanup.sh + - vhdbuilder/packer/convert-sig-to-classic-storage-account-blob.sh + - vhdbuilder/packer/generate-vhd-publishing-info.sh + - vhdbuilder/packer/init-variables.sh + - vhdbuilder/packer/windows/ + - parts/common/components.json - parts/windows exclude: - vhdbuilder/release-notes - /**/*.md - .github/** - e2e/scenario_test.go - - parts/common/components.json pool: name: $(AZURE_POOL_NAME) diff --git a/.pipelines/.vsts-vhd-builder.yaml b/.pipelines/.vsts-vhd-builder.yaml index 831bc76874c..48921c5272f 100644 --- a/.pipelines/.vsts-vhd-builder.yaml +++ b/.pipelines/.vsts-vhd-builder.yaml @@ -8,6 +8,17 @@ pr: paths: include: - schemas + - vhdbuilder/packer + - vhdbuilder/scripts/linux + - .pipelines/.vsts-vhd-builder.yaml + - .pipelines/templates/.builder-release-template.yaml + - .pipelines/templates/.template-override-components-json.yaml + - .pipelines/templates/.template-copy-file.yaml + - .pipelines/templates/e2e-template.yaml + - parts/linux/* + - packer.mk + - aks-node-controller/** + - parts/common/components.json exclude: - schemas/windows_settings.cue - vhdbuilder/release-notes @@ -19,8 +30,6 @@ pr: - /**/*.md - .github/** - e2e/scenario_win_test.go - - parts/common/components.json - pool: name: $(POOL_NAME) From 8876c361ffe993265175a94aac5cfb0b7b71ae91 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 6 Mar 2025 05:40:46 +0000 Subject: [PATCH 15/18] change reg key --- vhdbuilder/packer/windows/windows_settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vhdbuilder/packer/windows/windows_settings.json b/vhdbuilder/packer/windows/windows_settings.json index 1303af4b547..ab5c3c76baf 100644 --- a/vhdbuilder/packer/windows/windows_settings.json +++ b/vhdbuilder/packer/windows/windows_settings.json @@ -56,7 +56,7 @@ "WindowsSkuMatch": "*", "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Services\\hns\\State", "Name": "EnableCompartmentNamespace", - "Value": "1", + "Value": "2", "Type": "DWORD" }, { From fcf780d5d7aa252b18fa912afa21a883157db89a Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 6 Mar 2025 05:42:12 +0000 Subject: [PATCH 16/18] undo change --- vhdbuilder/packer/windows/windows_settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vhdbuilder/packer/windows/windows_settings.json b/vhdbuilder/packer/windows/windows_settings.json index ab5c3c76baf..1303af4b547 100644 --- a/vhdbuilder/packer/windows/windows_settings.json +++ b/vhdbuilder/packer/windows/windows_settings.json @@ -56,7 +56,7 @@ "WindowsSkuMatch": "*", "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Services\\hns\\State", "Name": "EnableCompartmentNamespace", - "Value": "2", + "Value": "1", "Type": "DWORD" }, { From 9d3767b1811103bcac7d0bfd40aceb14bcd3de80 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 6 Mar 2025 20:18:43 +0000 Subject: [PATCH 17/18] no context lines in comment --- .github/workflows/check-windows-packages-change.yml | 2 +- vhdbuilder/packer/windows/windows_settings.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/check-windows-packages-change.yml b/.github/workflows/check-windows-packages-change.yml index 6bbdc63dcaa..d04fa2f0c48 100644 --- a/.github/workflows/check-windows-packages-change.yml +++ b/.github/workflows/check-windows-packages-change.yml @@ -45,7 +45,7 @@ jobs: Write-Output "Changes cached containers or packages on windows VHDs" > $diffFile Write-Output "" >> $diffFile Write-Output '```diff' >> $diffFile - git diff >> $diffFile + git diff --unified=0 >> $diffFile Write-Output '```' >> $diffFile dir $diffFile diff --git a/vhdbuilder/packer/windows/windows_settings.json b/vhdbuilder/packer/windows/windows_settings.json index 1303af4b547..ab5c3c76baf 100644 --- a/vhdbuilder/packer/windows/windows_settings.json +++ b/vhdbuilder/packer/windows/windows_settings.json @@ -56,7 +56,7 @@ "WindowsSkuMatch": "*", "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Services\\hns\\State", "Name": "EnableCompartmentNamespace", - "Value": "1", + "Value": "2", "Type": "DWORD" }, { From 80563c691ec8857dffa374cd2bac3a8b9f0c5b56 Mon Sep 17 00:00:00 2001 From: Tim Wright Date: Thu, 6 Mar 2025 20:20:39 +0000 Subject: [PATCH 18/18] revert windows_settings --- vhdbuilder/packer/windows/windows_settings.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vhdbuilder/packer/windows/windows_settings.json b/vhdbuilder/packer/windows/windows_settings.json index ab5c3c76baf..1303af4b547 100644 --- a/vhdbuilder/packer/windows/windows_settings.json +++ b/vhdbuilder/packer/windows/windows_settings.json @@ -56,7 +56,7 @@ "WindowsSkuMatch": "*", "Path": "HKLM:\\SYSTEM\\CurrentControlSet\\Services\\hns\\State", "Name": "EnableCompartmentNamespace", - "Value": "2", + "Value": "1", "Type": "DWORD" }, {