Skip to content

CI: remove (future) deprecated --preserve-env flag #625

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

Merged
aramprice merged 1 commit into from
Jun 10, 2026
Merged

CI: remove (future) deprecated --preserve-env flag #625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions ci/tasks/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,17 @@ chown -R ubuntu:ubuntu "${REPO_PARENT}/bosh-linux-stemcell-builder"
chown -R ubuntu:ubuntu /mnt
sudo chmod u+s "$(which sudo)"

sudo --preserve-env --set-home --user ubuntu -- /bin/bash --login -i <<SUDO
sudo --set-home --user ubuntu -- \
env GEM_HOME="${GEM_HOME}" \
UBUNTU_ADVANTAGE_TOKEN="${UBUNTU_ADVANTAGE_TOKEN:-}" \
Comment thread
aramprice marked this conversation as resolved.
UBUNTU_FIPS_USE_IAAS_KERNEL="${UBUNTU_FIPS_USE_IAAS_KERNEL:-}" \
/bin/bash --login -i <<SUDO
set -e

cd "${REPO_PARENT}/bosh-linux-stemcell-builder"
bundle install

bundle exec rake stemcell:build[${IAAS},${HYPERVISOR},${OS_NAME},${OS_VERSION},${OS_IMAGE},${CANDIDATE_BUILD_NUMBER}]
bundle exec rake "stemcell:build[${IAAS},${HYPERVISOR},${OS_NAME},${OS_VERSION},${OS_IMAGE},${CANDIDATE_BUILD_NUMBER}]"
SUDO

#
Expand Down
9 changes: 7 additions & 2 deletions ci/tasks/os-images/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,16 @@ chown -R ubuntu:ubuntu "${REPO_PARENT}/bosh-linux-stemcell-builder"
chown -R ubuntu:ubuntu /mnt
sudo chmod u+s "$(which sudo)"

sudo --preserve-env --set-home --user ubuntu -- /bin/bash --login -i <<SUDO
sudo --set-home --user ubuntu -- \
env GEM_HOME="${GEM_HOME}" \
BUILD_TIME="${BUILD_TIME:-}" \
Comment thread
aramprice marked this conversation as resolved.
UBUNTU_ADVANTAGE_TOKEN="${UBUNTU_ADVANTAGE_TOKEN:-}" \
UBUNTU_DEBOOTSTRAP_MIRROR="${UBUNTU_DEBOOTSTRAP_MIRROR:-}" \
/bin/bash --login -i <<SUDO
Comment thread
aramprice marked this conversation as resolved.
set -e

cd "${REPO_PARENT}/bosh-linux-stemcell-builder"
bundle install

bundle exec rake stemcell:build_os_image[$OPERATING_SYSTEM_NAME,$OPERATING_SYSTEM_VERSION,$OS_IMAGE]
bundle exec rake "stemcell:build_os_image[${OPERATING_SYSTEM_NAME},${OPERATING_SYSTEM_VERSION},${OS_IMAGE}]"
SUDO
Loading