Thanks Łukasz Zemczak, We have a proposed PPA for ubuntu-advantage-tools that gives access to ESM on xenial, bionic and focal. We can test the output uusing the updated script I provided in the test case section abouve.
** Description changed: [Impact] Changes to the motd and update counting to count ESM security upgrades as security upgrades, and show some information about ESM upgrades. [Test case] The motd output has unit tests for the various combinations, passing counts of various upgrade types. That said, the actual counting might be wrong. The regression potential is higher in releases with ESM, as they'll get more messages and have more stuff that could go wrong. + + + #!/bin/bash + + # + # SRU Verification update-notifier + ubuntu=advantage-tools + # Test procedure: + # - launch container Trusty, Xenial or Bionic + # - Install ubuntu-advantage-tools from https://launchpad.net/~ua-client/+archive/ubuntu/proposed which supports esm on trusty, xenial, bionic, and focal + # - Attach container to UA subscription (which activates the ESM APT repos + # - run apt_check --human-readable to assert ESM pkg counts ARE NOT reported + # - Upgrade update-notifier to -proposed + # - re-run apt_check --human-readable to assert ESM pkg counts ARE reported + + 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/canonical-server/ua-client-daily/ubuntu \$RELEASE main + # keyid: 94E187AD53A59D1847E4880F8A295C4FB8B190B7 + + cat > test-uru.yaml <<EOF + #cloud-config + ssh_import_id: [chad.smith] + package_update: true + package_upgrade: true + apt: + sources: + ua.proposed: deb http://ppa.launchpad.net/ua-client/proposed/ubuntu \$RELEASE main + keyid: 6E34E7116C0BC933 + EOF + + + + cat > setup_proposed.sh <<EOF + #/bin/bash + mirror=http://archive.ubuntu.com/ubuntu + echo deb \$mirror \$(lsb_release -sc)-proposed main | tee /etc/apt/sources.list.d/proposed.list + apt-get update -q + apt-get install -qy update-notifier + EOF + + wait_for_boot() { + local vm=$1 release=$2 + echo "--- Wait for cloud-init to finish" + sleep 5 + lxc exec ${vm} -- cloud-init status --wait --long + } + + for release in xenial bionic focal; do + echo "--- BEGIN $release update-notifier testing" + vm=test-sru-$release + echo "--- Launch cloud-init with ppa:ua-client/proposed enabled" + lxc launch ubuntu-daily:${release} ${vm} -c user.user-data="$(cat test-un.yaml)" + wait_for_boot ${vm} ${release} + echo "--- Attach Ubuntu-Advantage, enabling services" + lxc exec ${vm} -- ua attach ${UA_TOKEN} + echo "--- Check Original MOTD output from apt_check before upgrade" + lxc exec ${vm} -- /usr/lib/update-notifier/apt-check --human-readable + echo "--- Upgrade update-notifier from -proposed" + lxc file push setup_proposed.sh ${vm}/ + lxc exec ${vm} -- bash /setup-proposed.sh | grep update-notifier + echo "--- Check upadate-notifier(-proposed) MOTD output from apt_check after upgrade" + lxc exec ${vm} -- /usr/lib/update-notifier/apt-check --human-readable + done + [Regression potential] Potentially wrong reporting, lost translations. [disco UIFe] https://lists.ubuntu.com/archives/ubuntu-translators/2019-April/007534.html ubuntu-doc held for moderation [SRU] We're only SRUing this to trusty, as xenial and bionic will have some more changes, and it would just be a waste of time to SRU the trusty one there. -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1822340 Title: [UIFe] motd messaging rewrite To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/update-notifier/+bug/1822340/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
