** Description changed: === Begin SRU Template === [Impact] Any Ubuntu Advantage apt-based service is enbled via a PPA. If those PPAs are not listed as valid mirrors in mirrors.cfg the PPAs get disabled across upgrade. UA-client has a script which will enable those PPAs across upgrade path, but needs the apt cache lock released during runPostInstallScripts. Validate Ubuntu Advantage apt access is retained across do-release- upgrade path so customers to not lose access to security updates after performing an upgrade. [Test Case] + #!/bin/bash + # # SRU Verification ubuntu-release-upgrader + ubuntu=advantage-tools # Test procedure: # - launch container Trusty, Xenial or Bionic # - Attach container to UA subscription (which activates a number of commerical PPAs # - download and run -proposed ubuntu-release-upgrader tool for upgrade release # - Assert successful upgrade # - Confirm valid mirrors not disabled # - Confirm third party non-commercial PPA URLs still disabled # - Confirm third party UA commercial URLs still disabled # (due to expected feature gap) # - Confirm UA status reports esm-infra still disabled (known feature gap) - set -ex + set -e UA_TOKEN=$1 if [ -z "$1" ]; then echo "Usage: $0 <contractTOKEN>" exit 1 fi # sources: # ua.proposed: # source: deb http://ppa.launchpad.net/ua-client/proposed/ubuntu \$RELEASE main # keyid: 6E34E7116C0BC933 + # sources: + # ua.proposed: + # source: deb http://ppa.launchpad.net/canonical-server/ua-client-daily/ubuntu \$RELEASE main + # keyid: 94E187AD53A59D1847E4880F8A295C4FB8B190B7 cat > test-uru.yaml <<EOF #cloud-config package_update: true package_upgrade: true apt: - apt_sources: - - source: "deb http://ppa.launchpad.net/ua-client/proposed/ubuntu trusty main" - keyid: 6E34E7116C0BC933 + sources: + ua.daily: + source: deb http://ppa.launchpad.net/canonical-server/ua-client-daily/ubuntu \$RELEASE main + keyid: 94E187AD53A59D1847E4880F8A295C4FB8B190B7 EOF # ua.list: # source: deb http://ppa.launchpad.net/canonical-server/ua-client-daily/ubuntu \$RELEASE main # keyid: 94E187AD53A59D1847E4880F8A295C4FB8B190B7 cat > checkaptpolicy.sh <<EOF #!/bin/bash set -x RELEASE=\`lsb_release -sc\` echo -n "Current release: $RELEASE" echo "Assert no disabled valid mirrors in /eta/apt/sources.list" ! grep disable /etc/apt/sources.list || echo "FAILURE: found disabled valid mirror urls" echo "Checking commercial Ubuntu Advantage PPAs apt policy and config" apt-cache policy | grep esm.ubuntu.com for file in \`ls /etc/apt/sources.list.d/ubuntu-*.list\`; do echo "--- file: \${file}" cat \${file} done EOF chmod 755 checkaptpolicy.sh declare -A NEXTDIST=( [bionic]=focal [xenial]=bionic [trusty]=xenial ) wait_for_boot() { local vm=$1 release=$2 echo "--- Wait for cloud-init to finish" + sleep 5 if [ "${release}" = "trusty" ]; then - while [ "N 2" != "$(lxc exec ${vm} -- runlevel)" ]; do + while [ "N 2" != "$(lxc exec ${vm} -- runlevel)" ]; do echo "waiting on runlevel 2" sleep 5 done status=$(lxc exec ${vm} -- test -f /var/run/cloud-init/result.json && echo "done" || echo "running" ) while [ "done" != "${status}" ]; do status=$(lxc exec ${vm} -- test -f /var/run/cloud-init/result.json && echo "done" || echo "running" ) echo -n '.' sleep 5 done else lxc exec ${vm} -- cloud-init status --wait --long fi } - for release in trusty; do + for release in xenial; do vm=test-sru-$release - echo "--- Launch cloud-init with ${release}-proposed enabled" + echo "--- Launch cloud-init with ua-client-${release}-daily enabled" lxc launch ubuntu-daily:${release} ${vm} -c user.user-data="$(cat test-uru.yaml)" upgraderelease=${NEXTDIST[$release]} + if [ "${release}" != "trusty" ]; then + dist_upgrade_disable_reason="no Release" + fi wait_for_boot ${vm} ${release} - echo "--- Attach Ubuntu-Advantage and enable services" + echo "--- Attach Ubuntu-Advantage, enabling services" lxc exec ${vm} -- ua attach ${UA_TOKEN} lxc exec ${vm} -- ua status --wait | tee ua-status.orig lxc file push checkaptpolicy.sh ${vm}/ lxc exec ${vm} -- /checkaptpolicy.sh > policy.orig lxc exec ${vm} -- wget http://archive.ubuntu.com/ubuntu/dists/$upgraderelease-proposed/main/dist-upgrader-all/current/$upgraderelease.tar.gz lxc exec ${vm} -- tar xzvf $upgraderelease.tar.gz echo "--- Add proposed PPA to valid mirrors to exercise ua-tools do-release-upgrade" lxc file pull ${vm}/root/mirrors.cfg . - sed -i 's/stable/proposed/' mirrors.cfg + echo "http://ppa.launchpad.net/canonical-server/ua-client-daily/ubuntu/"; >> mirrors.cfg lxc file push mirrors.cfg ${vm}/root/ - lxc exec ${vm} -- /root/$upgraderelease --datadir=/root --frontend DistUpgradeViewNonInteractive + lxc exec ${vm} -- /root/$upgraderelease --datadir=/root --frontend DistUpgradeViewNonInteractive | egrep 'Warning|Error|ubuntu-advantage' lxc exec ${vm} -- reboot || true - wait_for_boot ${vm} ${upgraderelease} - echo "--- Validate UA APT sources after upgrade" - lxc exec ${vm} -- /checkaptpolicy.sh > policy.upgrade - lxc exec test-sru-bionic grep disable /etc/apt/sources.list && "FAILURE: valid mirrors got disabled" || echo "SUCCESS: no valid mirrors disabled" - echo "--- Ensure UA status reports ESM disabled due to pending RT" + sleep 10 + lxc exec ${vm} grep disable /etc/apt/sources.list && "FAILURE: valid mirrors got disabled" || echo "SUCCESS: no valid mirrors disabled" lxc exec ${vm} -- ua status --wait | tee ua-status.upgrade - egrep 'esm-infra.*disabled' ua-status.upgrade || echo "FAILURE: unexpected enabled esm-infra" - echo "--- Expect disable reason to be no Release file in esm PPA" - lxc exec test-sru-bionic grep disable /var/log/dist-upgrade/main.log || echo "FAILURE: didn't find disabled update logs for esm" - echo "--- Expect disabled esm-infra in diffs from original and upgrade status" - diff -urN ua-status.orig ua-status.upgrade + if [ ! -z "${dist_upgrade_disable_reason}" ]; then + echo "--- Expect do-release-upgrade disable reason to be '$dist_upgrade_disable_reason' for ESM* PPAs" + lxc exec ${vm} grep "${dist_upgrade_disable_reason}" /var/log/dist-upgrade/main.log || echo "FAILURE: didn't find disabled update logs for esm" + fi + echo "--- Expect no diffs from original and upgraded ua status" + status_diff=$(diff -urN ua-status.orig ua-status.upgrade) + [ -z "$status_diff" ] && echo "SUCCESS: no diff" || echo -e "FAILURE: unexpected diff\n${status_diff}" + echo "--- Ensure UA re-enabled esm across upgrade" + lxc exec ${vm} -- egrep 'lts|change' /var/log/ubuntu-advantage.log + echo "--- Ensure UA status reports ESM enabled after upgrade" + egrep 'esm-infra.*enabled' ua-status.upgrade || echo "FAILURE: expected enabled esm-infra after upgrade" done - [Regression Potential] - None as UA support is not yet officially introduced in Xenial or later. + None as UA support is not yet officially introduced in Xenial or later. This patch only allows anyone currently overriding PostUpgradeScripts in DistUpgrade.cfg to perform apt update|install operations, which were previously prohibited due to apt lock. === End SRU Template === ==== Original Description === In order for custom PostInstallScript to add/remove apt packages and call apt update, DistUpgradecontroller needs to release the apt cache directory lock before that stage. If the lock is still in place, DistUpgradeController.runPostUpgradeScripts hits errors such as: E: Could not get lock /var/lib/apt/lists/lock - open (11: Resource temporarily unavailable) E: Unable to lock directory /var/lib/apt/lists/
-- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1897778 Title: DistUpgradeController to release apt lock during PostInstallScripts To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/ubuntu-release-upgrader/+bug/1897778/+subscriptions -- ubuntu-bugs mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
