feat: onboard ubuntu2604 cvm #9385
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,172 @@ | ||
| #!/bin/bash | ||
|
|
||
| # shellcheck disable=SC1090,SC2329 | ||
|
|
||
| Describe 'trim-2604-cvm-packages' | ||
| TRIM_SCRIPT="./vhdbuilder/packer/ubuntu-2604-cvm/trim-2604-cvm-packages.sh" | ||
|
|
||
| setup_trim() { | ||
| TEST_DIR="$(mktemp -d)" | ||
| source "${TRIM_SCRIPT}" | ||
| MARKED_FOR_REMOVAL_PACKAGES_FILE="${TEST_DIR}/marked-for-removal-packages.txt" | ||
| REQUIRED_PACKAGES_FILE="${TEST_DIR}/required-packages.txt" | ||
| FINAL_REQUIRED_PACKAGES_FILE="${TEST_DIR}/final-required-packages.txt" | ||
| FINAL_FORBIDDEN_PACKAGES_FILE="${TEST_DIR}/final-forbidden-packages.txt" | ||
| } | ||
|
|
||
| cleanup_trim() { | ||
| rm -rf "${TEST_DIR}" | ||
| } | ||
|
|
||
| BeforeEach 'setup_trim' | ||
| AfterEach 'cleanup_trim' | ||
|
|
||
| It 'filters comments and absent packages before purging' | ||
| printf '%s\n' '# comment' remove-me absent-package '' > "${MARKED_FOR_REMOVAL_PACKAGES_FILE}" | ||
| printf '%s\n' required-package > "${REQUIRED_PACKAGES_FILE}" | ||
|
|
||
| dpkg-query() { | ||
| for argument in "$@"; do | ||
| package="${argument}" | ||
| done | ||
| case "${package}" in | ||
| remove-me|required-package) | ||
| echo installed | ||
| ;; | ||
| *) | ||
| return 1 | ||
| ;; | ||
| esac | ||
| } | ||
| apt-get() { echo "apt-get $*"; } | ||
| apt-mark() { echo "apt-mark $*"; } | ||
|
|
||
| When call main | ||
| The status should be success | ||
| The output should include "Purging 1 installed server-cvm packages marked for removal" | ||
| The output should include "apt-get -o DPkg::Lock::Timeout=300 purge -y --no-auto-remove --allow-remove-essential remove-me" | ||
| The output should not include "allow-remove-essential absent-package" | ||
| The output should include "apt-mark manual cron curl gpg jq logrotate rsyslog sudo xfsprogs" | ||
| The output should not include "apt-mark manual cron curl gpg jq logrotate rsyslog sudo xfsprogs tcpdump" | ||
| End | ||
|
|
||
| It 'marks installed tcpdump runtime packages as manual' | ||
| printf '%s\n' remove-me > "${MARKED_FOR_REMOVAL_PACKAGES_FILE}" | ||
| printf '%s\n' required-package > "${REQUIRED_PACKAGES_FILE}" | ||
|
|
||
| dpkg-query() { | ||
| for argument in "$@"; do | ||
| package="${argument}" | ||
| done | ||
| case "${package}" in | ||
| remove-me|required-package|libc6|libpcap0.8t64|libssl3t64|systemd|tcpdump) | ||
| echo installed | ||
| ;; | ||
| *) | ||
| return 1 | ||
| ;; | ||
| esac | ||
| } | ||
| apt-get() { return 0; } | ||
| apt-mark() { echo "apt-mark $*"; } | ||
|
|
||
| When call main | ||
| The status should be success | ||
| The output should include "apt-mark manual cron curl gpg jq logrotate rsyslog sudo xfsprogs libc6 libpcap0.8t64 libssl3t64 systemd tcpdump" | ||
| End | ||
|
|
||
| It 'fails when the removal list is empty' | ||
| : > "${MARKED_FOR_REMOVAL_PACKAGES_FILE}" | ||
| printf '%s\n' required-package > "${REQUIRED_PACKAGES_FILE}" | ||
|
|
||
| When call main | ||
| The status should be failure | ||
| The error should include "Marked-for-removal package list is missing or empty" | ||
| End | ||
|
|
||
| It 'fails when a required package is missing after trimming' | ||
| printf '%s\n' absent-package > "${MARKED_FOR_REMOVAL_PACKAGES_FILE}" | ||
| printf '%s\n' required-package > "${REQUIRED_PACKAGES_FILE}" | ||
|
|
||
| dpkg-query() { return 1; } | ||
| apt-mark() { return 0; } | ||
|
|
||
| When call main | ||
| The status should be failure | ||
| The output should include "No installed server-cvm packages marked for removal were found" | ||
| The error should include "Required CVM package pattern is not installed: required-package" | ||
| End | ||
|
|
||
| It 'supports final verification without running another purge' | ||
| printf '%s\n' remove-me > "${MARKED_FOR_REMOVAL_PACKAGES_FILE}" | ||
| printf '%s\n' initial-required-package > "${REQUIRED_PACKAGES_FILE}" | ||
| printf '%s\n' final-required-package > "${FINAL_REQUIRED_PACKAGES_FILE}" | ||
| printf '%s\n' forbidden-package > "${FINAL_FORBIDDEN_PACKAGES_FILE}" | ||
|
|
||
| dpkg-query() { | ||
| for argument in "$@"; do | ||
| package="${argument}" | ||
| done | ||
| [ "${package}" = "final-required-package" ] && echo installed | ||
| } | ||
| apt-get() { | ||
| echo "unexpected apt-get" | ||
| return 1 | ||
| } | ||
| apt-mark() { | ||
| echo "unexpected apt-mark" | ||
| return 1 | ||
| } | ||
|
|
||
| When call main --verify-only | ||
| The status should be success | ||
| The output should not include "unexpected" | ||
| End | ||
|
|
||
| It 'fails final verification when a forbidden vanilla package is installed' | ||
| printf '%s\n' final-required-package > "${FINAL_REQUIRED_PACKAGES_FILE}" | ||
| printf '%s\n' vanilla-package > "${FINAL_FORBIDDEN_PACKAGES_FILE}" | ||
|
|
||
| dpkg-query() { | ||
| for argument in "$@"; do | ||
| package="${argument}" | ||
| done | ||
| case "${package}" in | ||
| final-required-package|vanilla-package) | ||
| echo installed | ||
| ;; | ||
| esac | ||
| } | ||
|
|
||
| When call main --verify-only | ||
| The status should be failure | ||
| The error should include "Forbidden CVM package pattern is installed: vanilla-package" | ||
| End | ||
|
|
||
| It 'fails final verification when the required package list is empty' | ||
| : > "${FINAL_REQUIRED_PACKAGES_FILE}" | ||
|
|
||
| When call main --verify-only | ||
| The status should be failure | ||
| The error should include "Required package list is missing or empty" | ||
| End | ||
|
|
||
| It 'fails final verification when the forbidden package list is empty' | ||
| printf '%s\n' final-required-package > "${FINAL_REQUIRED_PACKAGES_FILE}" | ||
| : > "${FINAL_FORBIDDEN_PACKAGES_FILE}" | ||
|
|
||
| dpkg-query() { | ||
| echo installed | ||
| } | ||
|
|
||
| When call main --verify-only | ||
| The status should be failure | ||
| The error should include "Forbidden package list is missing or empty" | ||
| End | ||
|
|
||
| It 'rejects unknown arguments' | ||
| When call main --unknown | ||
| The status should be failure | ||
| The error should include "Unknown argument: --unknown" | ||
| End | ||
| End |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -129,6 +129,13 @@ else | |
| apt_get_update || exit $ERR_APT_UPDATE_TIMEOUT | ||
| apt_get_dist_upgrade || exit $ERR_APT_DIST_UPGRADE_TIMEOUT | ||
|
|
||
| if isUbuntu "$OS" && | ||
| [ "$OS_VERSION" = "26.04" ] && | ||
| isMinimalImage && | ||
| grep -q "cvm" <<< "$FEATURE_FLAGS"; then | ||
| /bin/bash /home/packer/trim-2604-cvm-packages.sh | ||
|
zachary-bailey marked this conversation as resolved.
|
||
| fi | ||
|
|
||
| # shellcheck disable=SC3010 | ||
| if [[ "${ENABLE_FIPS,,}" == "true" ]]; then | ||
| # This is FIPS Install for Ubuntu, it purges non FIPS Kernel and attaches UA FIPS Updates | ||
|
|
@@ -177,13 +184,11 @@ if [[ ${UBUNTU_RELEASE//./} -ge 2204 && "${ENABLE_FIPS,,}" != "true" ]]; then | |
|
|
||
| # Choose kernel packages based on Ubuntu version and architecture | ||
| if grep -q "cvm" <<< "$FEATURE_FLAGS"; then | ||
| KERNEL_IMAGE="linux-azure-fde-lts-${UBUNTU_RELEASE}" | ||
| KERNEL_PACKAGES=( | ||
| "${KERNEL_IMAGE}" | ||
| ) | ||
|
zachary-bailey marked this conversation as resolved.
Comment on lines
186
to
190
Contributor
There was a problem hiding this comment. Zachary (@zachary-bailey) we confirmed this new logic works fine for other Ubuntu releases right? |
||
| MODULES_EXTRA_PKG="linux-modules-extra-azure-fde-lts-${UBUNTU_RELEASE}" | ||
| echo "Installing fde LTS kernel for CVM Ubuntu ${UBUNTU_RELEASE}" | ||
| else | ||
| # Use LTS kernel for other versions | ||
|
|
@@ -194,11 +199,11 @@ if [[ ${UBUNTU_RELEASE//./} -ge 2204 && "${ENABLE_FIPS,,}" != "true" ]]; then | |
| "linux-cloud-tools-azure-lts-${UBUNTU_RELEASE}" | ||
| "linux-headers-azure-lts-${UBUNTU_RELEASE}" | ||
| ) | ||
| MODULES_EXTRA_PKG="linux-modules-extra-azure-lts-${UBUNTU_RELEASE}" | ||
| echo "Installing LTS kernel for Ubuntu ${UBUNTU_RELEASE}" | ||
| fi | ||
|
|
||
| # Add modules-extra only when the package exists in the current apt repo | ||
| if apt-cache show "${MODULES_EXTRA_PKG}" &>/dev/null; then | ||
| KERNEL_PACKAGES+=("${MODULES_EXTRA_PKG}") | ||
| else | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.