← Back to branch summary

~philroche/ubuntu-on-ec2/ec2-publishing-scripts-modify-access

« back to all changes in this revision

Viewing changes to promote-daily

  • Committer: Phil Roche
  • Date: 2017-07-28 08:14:33 UTC
  • mfrom: (651.3.2 ec2-publishing-scripts)
  • Revision ID: phil.roche@canonical.com-20170728081433-raqzo1vksh3vi0u7
Merge lp:~philroche/ubuntu-on-ec2/ec2-publishing-scripts-promote-disable-reuse into lp:~ubuntu-on-ec2/ubuntu-on-ec2/ec2-publishing-scripts [a=philroche] [r=daniel-thewatkins,rcj]

Do not use reuse-ebs-from as it doesn't use cloud-image-manager

Which we need to set attributes. This change is as a result of HVM EBS amis
not having the required ENASupport attribute set.

Bypassing reuse of snapshots will result in a longer promotion

MP: https://code.launchpad.net/~philroche/ubuntu-on-ec2/ec2-publishing-scripts-promote-disable-reuse/+merge/328184

Show diffs side-by-side

added added

removed removed

Lines of Context:
promote-daily
147
147
if [ ! -f "${published_results}" ]; then
148
148
        # do not add any launch permissions, those are added later
149
149
        error "publishing build ${suite}/${build_name}/${label}/${serial}"
150
 
        reuse_args=""
151
 
        [ -f "${build_d}/published-ec2-daily.txt" ] &&
152
 
                reuse_args="--reuse-ebs-from=${build_d}/published-ec2-daily.txt"
 
150
 
153
151
        [ ${verbosity} -ne 0 ] && verbose="--verbose" || verbose=""
154
152
 
155
153
        [ $republish -eq 1 ] && noindex=0 || noindex=1
156
154
        NO_WEB_INDICES=$noindex \
157
155
                publish-build --serial "${serial}" --add-launch none ${verbose} \
158
156
                ${allow_existing} \
159
 
                ${reuse_args} \
160
157
                "${suite}" "${build_name}" "${label}" "${build_d}" ||
161
158
        fail "failed to publish build"
162
159
else