From 2fc88204e40d98ae00ca9e715c5b8c1c3c280b72 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Jul 12 2016 19:34:16 +0000 Subject: [PATCH 1/9] Revert "make a temporary atomic page until we build them again" This reverts commit 66d137712a34a2afbf9449e6dd4780dfb1a6af7e. --- diff --git a/getfedora.org/data/content/cloud/download/atomic-orig-inal.html b/getfedora.org/data/content/cloud/download/atomic-orig-inal.html deleted file mode 100644 index 821e13d..0000000 --- a/getfedora.org/data/content/cloud/download/atomic-orig-inal.html +++ /dev/null @@ -1,281 +0,0 @@ - - - - - - - ${_('Download Fedora Cloud')} - - - - - - - -
-
-
-
-

${Markup(_('Download Fedora %(rel)s Cloud')) % {'rel':global_variables.release['curr_id']}}

-

${_('There are two main versions of Fedora Cloud available:')} -

    -
  • ${Markup(_('<a href="index.html">Base images</a> suitable for creating VMs.'))}
    • - -
-

-
-
-
-
- - -
-
-
- -
-
- -
-
-
- -
-
-
-
-
-

${_('Atomic Host Images')}

-

${_('Fedora Atomic Host is a leading edge base operating system following the Project Atomic model. It is designed around Kubernetes and Docker containers. The images published here showcase that work. Note that the images have passed several levels of automated testing, but are not always subjected to manual testing by the QA team.')}

-

${Markup(_('Please test before using new versions in production. If you do discover a problem, the Atomic Host tools make it easy to flip back to an earlier release — and if that happens, please also help us by <a href="%s">filing bugs</a> or <a href="%s">submitting fixes</a>.') % ('http://www.projectatomic.io/community/', 'https://github.com/projectatomic/'))}

-

${_('Fedora Atomic Host images are updated roughly every two weeks, rather than on the main six-month Fedora cadence. Because development is moving quickly, only the latest major Fedora release is supported.')}

-

${Markup(_('Note that different Fedora Atomic Host media are subject to different levels of automatic testing. We are making continuous improvements to these tests; <a href="%s">click here</a> to see the current test status.') % ('https://apps.fedoraproject.org/autocloud/jobs/'))}

-

${Markup(_('You can learn more about the Atomic project at <a href="%s">projectatomic.io</a>.') % ('http://projectatomic.io/'))}

-

${Markup(_('The latest two week build did not meet our testing criteria. The images available are from over %(atomic_age)s days ago. Check the Project Atomic blog for updates and information about Atomic blocker bugs.') % global_variables.release)}

-

${Markup(_('These are the latest official Fedora Atomic Host images, produced %(atomic_age)s days ago.') % global_variables.release)}

-

${_('Atomic Host Image')}

-
-
- -
-
-
${_('qcow2 Image')}
-

${Markup(_('This is Fedora %(rel)s Cloud Atomic Host in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['curr_id']}}

- ${_('Download')} -

${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['atomic_qcow2_cloud']}

-
-
-
${_('Raw Image')}
-

${Markup(_('This is Fedora %(rel)s Cloud Atomic Host in a compressed raw image format. If you\'re not sure what to use, try this.')) % {'rel':global_variables.release['curr_id']}}

- ${_('Download')} -

${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['atomic_raw_cloud']}

-
-
- - - - - - - -
-
-

${_('Atomic Host Images for Vagrant')}

-

${_('These images are Vagrant Boxes images for deployment using Vagrant.')}

-
-
- -
-
-
${_('VirtualBox Image')}
-

${_('If you\'re using Vagrant on Mac OS X or Windows, this is likely the image you\'ll want to use.')}

- ${_('VirtualBox Image')} -

${_('64-bit %sMB VirtualBox Atomic Host Vagrant Image') % global_variables.iso_size['atomic_VBvag_cloud']}

-
-
-
${_('libvirt/KVM Image')}
-

${_('If you\'re using Vagrant on Fedora, this is the image you\'ll want to use.')}

- ${_('libvirt/KVM Image')} -

${_('64-bit %sMB libvirt/KVM Atomic Host Vagrant Image') % global_variables.iso_size['atomic_libvag_cloud']}

-
-
- - - - - - - - -
-
-

${_('Atomic Host Cloud Images for Amazon Public Cloud EC2')}

-

${_('The links below will provide you listings of available AMIs by region with buttons to launch them in your Amazon Web Services account. AMI IDs for usage with the AWS Console or command-line tools are also provided.')}

-

${_('All images are available in two formats: a GP2 format which uses faster SSD storage, and a standard format which is more suitable if you have infrequently accessed data and you want to keep storage cost low.')}

-
-
-
-
-
${_('Hardware Virtual Machine (HVM)')}
- - - - - -

- - - -
-
- -
- -
- -
-

${_('Other Downloads')}

-

- ${_('Atomic Host Image:')} -

-

-
- - -

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Alpha is here! - - -

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

- Fedora ${global_variables.release['next_id']} Beta is here! - - -
- -
-
-
- - - diff --git a/getfedora.org/data/content/cloud/download/atomic.html b/getfedora.org/data/content/cloud/download/atomic.html index 29ea200..821e13d 100644 --- a/getfedora.org/data/content/cloud/download/atomic.html +++ b/getfedora.org/data/content/cloud/download/atomic.html @@ -31,8 +31,8 @@
-

${Markup(_('Download Fedora Cloud'))}

-

${_('There is only one main version of Fedora Cloud available:')} +

${Markup(_('Download Fedora %(rel)s Cloud')) % {'rel':global_variables.release['curr_id']}}

+

${_('There are two main versions of Fedora Cloud available:')}

  • ${Markup(_('<a href="index.html">Base images</a> suitable for creating VMs.'))}
    • +
    +
    +
    ${_('qcow2 Image')}
    +

    ${Markup(_('This is Fedora %(rel)s Cloud Atomic Host in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['curr_id']}}

    + ${_('Download')} +

    ${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['atomic_qcow2_cloud']}

    +
    +
    +
    ${_('Raw Image')}
    +

    ${Markup(_('This is Fedora %(rel)s Cloud Atomic Host in a compressed raw image format. If you\'re not sure what to use, try this.')) % {'rel':global_variables.release['curr_id']}}

    + ${_('Download')} +

    ${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['atomic_raw_cloud']}

    +
    +
    + + + + + + + +
    +
    +

    ${_('Atomic Host Images for Vagrant')}

    +

    ${_('These images are Vagrant Boxes images for deployment using Vagrant.')}

    +
    +
    + +
    +
    +
    ${_('VirtualBox Image')}
    +

    ${_('If you\'re using Vagrant on Mac OS X or Windows, this is likely the image you\'ll want to use.')}

    + ${_('VirtualBox Image')} +

    ${_('64-bit %sMB VirtualBox Atomic Host Vagrant Image') % global_variables.iso_size['atomic_VBvag_cloud']}

    +
    +
    +
    ${_('libvirt/KVM Image')}
    +

    ${_('If you\'re using Vagrant on Fedora, this is the image you\'ll want to use.')}

    + ${_('libvirt/KVM Image')} +

    ${_('64-bit %sMB libvirt/KVM Atomic Host Vagrant Image') % global_variables.iso_size['atomic_libvag_cloud']}

    +
    +
    + + + + + + + + +
    +
    +

    ${_('Atomic Host Cloud Images for Amazon Public Cloud EC2')}

    +

    ${_('The links below will provide you listings of available AMIs by region with buttons to launch them in your Amazon Web Services account. AMI IDs for usage with the AWS Console or command-line tools are also provided.')}

    +

    ${_('All images are available in two formats: a GP2 format which uses faster SSD storage, and a standard format which is more suitable if you have infrequently accessed data and you want to keep storage cost low.')}

    +
    +
    +
    +
    +
    ${_('Hardware Virtual Machine (HVM)')}
    + + + + + +

    + + + +
    +
    + +
    +
+ +
+

${_('Other Downloads')}

+

+ ${_('Atomic Host Image:')} +

+

+
+ + +

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

+ Fedora ${global_variables.release['next_id']} Alpha is here! + + +

${Markup(_('Try Fedora %(rel)s %(state)s')) % {'rel':global_variables.release['next_id'], 'state':global_variables.release['curr_state']}}

+ Fedora ${global_variables.release['next_id']} Beta is here! + + +
+ +
+
From 8b750f27a500f71c69fcea072f92a6071ee5f487 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Jul 12 2016 19:41:43 +0000 Subject: [PATCH 2/9] Revert "no atomic images for F24 release - they will be there later" This reverts commit 2a909b37c8b7bd415555012a1cdb4614016b3fde. --- diff --git a/getfedora.org/data/content/cloud/download/atomic.html b/getfedora.org/data/content/cloud/download/atomic.html index 821e13d..941526f 100644 --- a/getfedora.org/data/content/cloud/download/atomic.html +++ b/getfedora.org/data/content/cloud/download/atomic.html @@ -35,8 +35,7 @@

${_('There are two main versions of Fedora Cloud available:')}

  • ${Markup(_('<a href="index.html">Base images</a> suitable for creating VMs.'))}
    • - +
  • ${Markup(_('<a href="atomic.html">Atomic Host images</a> for creating hosts for container deployment.'))}

@@ -57,7 +56,7 @@
diff --git a/getfedora.org/data/content/cloud/download/docker.html b/getfedora.org/data/content/cloud/download/docker.html index 7d41956..d20b602 100644 --- a/getfedora.org/data/content/cloud/download/docker.html +++ b/getfedora.org/data/content/cloud/download/docker.html @@ -35,8 +35,7 @@

${_('There are two main versions of Fedora Cloud available:')}

  • ${Markup(_('<a href="index.html">Base images</a> suitable for creating VMs.'))}
    • - +
  • ${Markup(_('<a href="atomic.html">Atomic Host images</a> for creating hosts for container deployment.'))}

@@ -57,7 +56,7 @@
diff --git a/getfedora.org/data/content/cloud/download/index.html b/getfedora.org/data/content/cloud/download/index.html index 9328dbf..4b31eca 100644 --- a/getfedora.org/data/content/cloud/download/index.html +++ b/getfedora.org/data/content/cloud/download/index.html @@ -35,8 +35,7 @@

${_('There are two main versions of Fedora Cloud available:')}

  • ${Markup(_('<a href="index.html">Base images</a> suitable for creating VMs.'))}
    • - +
  • ${Markup(_('<a href="atomic.html">Atomic Host images</a> for creating hosts for container deployment.'))}

@@ -57,7 +56,7 @@
From 6d99bb5a282ed2ec9a672f0bd6e515d542696a6c Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Jul 12 2016 19:58:50 +0000 Subject: [PATCH 3/9] Revert "workaround to build getfedora - needs to be reverted as it looks for previous atomic images now" This reverts commit 1aa6985639dc0499359fd31d1d2dc6a82679f59e. --- diff --git a/getfedora.org/build/atomic_vars.py b/getfedora.org/build/atomic_vars.py index a17d8af..9f4ee0f 100755 --- a/getfedora.org/build/atomic_vars.py +++ b/getfedora.org/build/atomic_vars.py @@ -101,7 +101,7 @@ def make_templates(release): return [ # As things stand now, we only do two-week-atomic stuff for the current # stable release. - (release['prev_id'], '', ''), + (release['curr_id'], '', ''), # If we ever move to doing pre-release versions as well, just uncomment # the following line and it should all work. We leave it commented out From cf371ae3f7f51095c81416242a92ae137ee81b14 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Jul 12 2016 20:07:15 +0000 Subject: [PATCH 4/9] Report this error more clearly... --- diff --git a/getfedora.org/build/atomic_vars.py b/getfedora.org/build/atomic_vars.py index 9f4ee0f..cda2fb3 100755 --- a/getfedora.org/build/atomic_vars.py +++ b/getfedora.org/build/atomic_vars.py @@ -62,6 +62,8 @@ def get_page(page, pages): rows_per_page=1, ) response = session.get(base_url, params=params) + if not bool(response): + raise IOError("Failed to talk to %r %r" % (response.url, response)) return response.json() From ec0303d4885fc84afc4ccf61cb4547d5e075c8a3 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Jul 12 2016 20:41:25 +0000 Subject: [PATCH 5/9] That old target doesnt appear in twoweek messages anymore. --- diff --git a/getfedora.org/build/atomic_vars.py b/getfedora.org/build/atomic_vars.py index cda2fb3..d3ea214 100755 --- a/getfedora.org/build/atomic_vars.py +++ b/getfedora.org/build/atomic_vars.py @@ -122,7 +122,7 @@ def collect(release): log.info("Looking for latest atomic release for %s" % idx) # Get the *latest* atomic release information. - messages = get_messages('"%s"' % idx) + messages = get_messages('-%s-' % idx) try: message = messages.next() except StopIteration: From 310f84df74514b5671496b297dbba76b976933ad Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Jul 12 2016 20:41:40 +0000 Subject: [PATCH 6/9] The format of the image_name changed. This should be more resilient in the future. --- diff --git a/getfedora.org/build/atomic_vars.py b/getfedora.org/build/atomic_vars.py index d3ea214..7c0a9f5 100755 --- a/getfedora.org/build/atomic_vars.py +++ b/getfedora.org/build/atomic_vars.py @@ -131,7 +131,7 @@ def collect(release): # Parse the composedate out of the image_name image_name = message['msg']['atomic_qcow2']['image_name'] - composedate = '.'.join(image_name.split('-')[4].split('.')[:-2]) + composedate = '.'.join(image_name.split('-')[-1].split('.')[:-2]) log.info(" Found composedate: %s" % composedate) results['release'][composedate_prefix + 'atomic_composedate'] = composedate From 34ea9fd4ef0ef67de1e2c81cd5f8e502dc70e277 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Jul 12 2016 20:41:52 +0000 Subject: [PATCH 7/9] Adjust F24 atomic image urls. --- diff --git a/getfedora.org/data/content/cloud/download/atomic.html b/getfedora.org/data/content/cloud/download/atomic.html index 941526f..9a78613 100644 --- a/getfedora.org/data/content/cloud/download/atomic.html +++ b/getfedora.org/data/content/cloud/download/atomic.html @@ -84,13 +84,13 @@
${_('qcow2 Image')}

${Markup(_('This is Fedora %(rel)s Cloud Atomic Host in a Qcow2-formatted image for use with OpenStack.')) % {'rel':global_variables.release['curr_id']}}

- ${_('Download')} + ${_('Download')}

${_('64-bit %sMB Qcow2 Image') % global_variables.iso_size['atomic_qcow2_cloud']}

${_('Raw Image')}

${Markup(_('This is Fedora %(rel)s Cloud Atomic Host in a compressed raw image format. If you\'re not sure what to use, try this.')) % {'rel':global_variables.release['curr_id']}}

- ${_('Download')} + ${_('Download')}

${_('64-bit %sMB xz-Compressed Raw Image') % global_variables.iso_size['atomic_raw_cloud']}

@@ -108,11 +108,11 @@ @@ -130,13 +130,13 @@
${_('VirtualBox Image')}

${_('If you\'re using Vagrant on Mac OS X or Windows, this is likely the image you\'ll want to use.')}

- ${_('VirtualBox Image')} + ${_('VirtualBox Image')}

${_('64-bit %sMB VirtualBox Atomic Host Vagrant Image') % global_variables.iso_size['atomic_VBvag_cloud']}

${_('libvirt/KVM Image')}

${_('If you\'re using Vagrant on Fedora, this is the image you\'ll want to use.')}

- ${_('libvirt/KVM Image')} + ${_('libvirt/KVM Image')}

${_('64-bit %sMB libvirt/KVM Atomic Host Vagrant Image') % global_variables.iso_size['atomic_libvag_cloud']}

@@ -154,11 +154,11 @@ From 313f82237ae87f96bb2f0579b083d61bff0bbd5c Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Jul 12 2016 20:54:57 +0000 Subject: [PATCH 8/9] Remove old default AMIs. They cause false positives. --- diff --git a/build.d/globalvar.py b/build.d/globalvar.py index bbe1216..01f17f9 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -249,149 +249,147 @@ for _, short, code in EC2_regions: # EC2 AMI IDs HVM_base_AMI={ - 'us-east-1': 'ami-775c9b1a', # Virginia - 'us-west-2': 'ami-cf00c5af', # Oregon - 'us-west-1': 'ami-4e98dd2e', # California - 'eu-west-1': 'ami-19fa646a', # Ireland - 'eu-central-1': 'ami-62628b0d', # Frankfurt - 'ap-southeast-1': 'ami-fde0339e', # Singapore - 'ap-northeast-1': 'ami-0c0be16d', # Tokyo - 'ap-southeast-2': 'ami-90a38af3', # Sydney - 'sa-east-1': 'ami-3ebf3552' # Sao Paolo + #'us-east-1': 'ami-775c9b1a', # Virginia + #'us-west-2': 'ami-cf00c5af', # Oregon + #'us-west-1': 'ami-4e98dd2e', # California + #'eu-west-1': 'ami-19fa646a', # Ireland + #'eu-central-1': 'ami-62628b0d', # Frankfurt + #'ap-southeast-1': 'ami-fde0339e', # Singapore + #'ap-northeast-1': 'ami-0c0be16d', # Tokyo + #'ap-southeast-2': 'ami-90a38af3', # Sydney + #'sa-east-1': 'ami-3ebf3552' # Sao Paolo } GP2_HVM_base_AMI={ - 'us-east-1': 'ami-2a5d9a47', # Virginia - 'us-west-2': 'ami-dcfe3bbc', # Oregon - 'us-west-1': 'ami-aa9edbca', # California - 'eu-west-1': 'ami-16fd6365', # Ireland - 'eu-central-1': 'ami-a36188cc', # Frankfurt - 'ap-southeast-1': 'ami-1be73478', # Singapore - 'ap-northeast-1': 'ami-8a35dfeb', # Tokyo - 'ap-southeast-2': 'ami-93a38af0', # Sydney - 'sa-east-1': 'ami-0a46cc66' # Sao Paolo + #'us-east-1': 'ami-2a5d9a47', # Virginia + #'us-west-2': 'ami-dcfe3bbc', # Oregon + #'us-west-1': 'ami-aa9edbca', # California + #'eu-west-1': 'ami-16fd6365', # Ireland + #'eu-central-1': 'ami-a36188cc', # Frankfurt + #'ap-southeast-1': 'ami-1be73478', # Singapore + #'ap-northeast-1': 'ami-8a35dfeb', # Tokyo + #'ap-southeast-2': 'ami-93a38af0', # Sydney + #'sa-east-1': 'ami-0a46cc66' # Sao Paolo } PV_base_AMI={ - 'us-east-1': 'ami-015b9c6c', # Virginia - 'us-west-2': 'ami-3c05c05c', # Oregon - 'us-west-1': 'ami-189edb78', # California - 'eu-west-1': 'ami-2afd6359', # Ireland - 'eu-central-1': 'ami-f561889a', # Frankfurt - 'ap-southeast-1': 'ami-f7e13294', # Singapore - 'ap-northeast-1': 'ami-6a0ee40b', # Tokyo - 'ap-southeast-2': 'ami-28a38a4b', # Sydney - 'sa-east-1': 'ami-e34fc58f' # Sao Paolo + #'us-east-1': 'ami-015b9c6c', # Virginia + #'us-west-2': 'ami-3c05c05c', # Oregon + #'us-west-1': 'ami-189edb78', # California + #'eu-west-1': 'ami-2afd6359', # Ireland + #'eu-central-1': 'ami-f561889a', # Frankfurt + #'ap-southeast-1': 'ami-f7e13294', # Singapore + #'ap-northeast-1': 'ami-6a0ee40b', # Tokyo + #'ap-southeast-2': 'ami-28a38a4b', # Sydney + #'sa-east-1': 'ami-e34fc58f' # Sao Paolo } GP2_PV_base_AMI={ - 'us-east-1': 'ami-095b9c64', # Virginia - 'us-west-2': 'ami-fa06c39a', # Oregon - 'us-west-1': 'ami-a99fdac9', # California - 'eu-west-1': 'ami-28ff615b', # Ireland - 'eu-central-1': 'ami-6e638a01', # Frankfurt - 'ap-southeast-1': 'ami-28e1324b', # Singapore - 'ap-northeast-1': 'ami-b30ae0d2', # Tokyo - 'ap-southeast-2': 'ami-f4a58c97', # Sydney - 'sa-east-1': 'ami-4346cc2f' # Sao Paolo + #'us-east-1': 'ami-095b9c64', # Virginia + #'us-west-2': 'ami-fa06c39a', # Oregon + #'us-west-1': 'ami-a99fdac9', # California + #'eu-west-1': 'ami-28ff615b', # Ireland + #'eu-central-1': 'ami-6e638a01', # Frankfurt + #'ap-southeast-1': 'ami-28e1324b', # Singapore + #'ap-northeast-1': 'ami-b30ae0d2', # Tokyo + #'ap-southeast-2': 'ami-f4a58c97', # Sydney + #'sa-east-1': 'ami-4346cc2f' # Sao Paolo } HVM_atomic_AMI={ - 'us-east-1': 'ami-f18fff9b', # Virginia - 'us-west-2': 'ami-79e8d449', # Oregon - 'us-west-1': 'ami-cb2337aa', # California - 'eu-west-1': 'ami-ca08b0a6', # Ireland - 'eu-central-1': 'ami-5208d721', # Frankfurt - 'ap-southeast-1': 'ami-06d68965', # Singapore - 'ap-northeast-1': 'ami-691f3a07', # Tokyo - 'ap-southeast-2': 'ami-5c736030', # Sydney - 'sa-east-1': 'ami-64ff9304' # Sao Paolo + #'us-east-1': 'ami-f18fff9b', # Virginia + #'us-west-2': 'ami-79e8d449', # Oregon + #'us-west-1': 'ami-cb2337aa', # California + #'eu-west-1': 'ami-ca08b0a6', # Ireland + #'eu-central-1': 'ami-5208d721', # Frankfurt + #'ap-southeast-1': 'ami-06d68965', # Singapore + #'ap-northeast-1': 'ami-691f3a07', # Tokyo + #'ap-southeast-2': 'ami-5c736030', # Sydney + #'sa-east-1': 'ami-64ff9304' # Sao Paolo } GP2_HVM_atomic_AMI={ - 'us-east-1': 'ami-e38cfc89', # Virginia - 'us-west-2': 'ami-182c3879', # Oregon - 'us-west-1': 'ami-0efc906e', # California - 'eu-west-1': 'ami-120ad561', # Ireland - 'eu-central-1': 'ami-d94c5fb5', # Frankfurt - 'ap-southeast-1': 'ami-3cb97e5f', # Singapore - 'ap-northeast-1': 'ami-261e3b48', # Tokyo - 'ap-southeast-2': 'ami-31d68952', # Sydney - 'sa-east-1': 'ami-8509b1e9' # Sao Paolo + #'us-east-1': 'ami-e38cfc89', # Virginia + #'us-west-2': 'ami-182c3879', # Oregon + #'us-west-1': 'ami-0efc906e', # California + #'eu-west-1': 'ami-120ad561', # Ireland + #'eu-central-1': 'ami-d94c5fb5', # Frankfurt + #'ap-southeast-1': 'ami-3cb97e5f', # Singapore + #'ap-northeast-1': 'ami-261e3b48', # Tokyo + #'ap-southeast-2': 'ami-31d68952', # Sydney + #'sa-east-1': 'ami-8509b1e9' # Sao Paolo } # EC2 AMI IDs PRERELEASE!!! -# TODO - replace the hand-typed IDs below with results harvested from fedimg - pre_HVM_base_AMI={ - 'us-east-1': 'ami-cec321a3', # Virginia - 'us-west-2': 'ami-ab55a7cb', # Oregon - 'us-west-1': 'ami-8b4c35eb', # California - 'eu-west-1': 'ami-fb40cb88', # Ireland - 'eu-central-1': 'ami-b29974dd', # Frankfurt - 'ap-southeast-1': 'ami-6471a607', # Singapore - 'ap-northeast-1': 'ami-6b6a8f0a', # Tokyo - 'ap-southeast-2': 'ami-aae7cbc9', # Sydney - 'sa-east-1': 'ami-be1099d2' # Sao Paolo + #'us-east-1': 'ami-cec321a3', # Virginia + #'us-west-2': 'ami-ab55a7cb', # Oregon + #'us-west-1': 'ami-8b4c35eb', # California + #'eu-west-1': 'ami-fb40cb88', # Ireland + #'eu-central-1': 'ami-b29974dd', # Frankfurt + #'ap-southeast-1': 'ami-6471a607', # Singapore + #'ap-northeast-1': 'ami-6b6a8f0a', # Tokyo + #'ap-southeast-2': 'ami-aae7cbc9', # Sydney + #'sa-east-1': 'ami-be1099d2' # Sao Paolo } pre_GP2_HVM_base_AMI={ - 'us-east-1': 'ami-70c2201d', # Virginia - 'us-west-2': 'ami-584a3338', # Oregon - 'us-west-1': 'ami-0ee7956e', # California - 'eu-west-1': 'ami-315bd042', # Ireland - 'eu-central-1': 'ami-ab9974c4', # Frankfurt - 'ap-southeast-1': 'ami-3c72a55f', # Singapore - 'ap-northeast-1': 'ami-da698cbb', # Tokyo - 'ap-southeast-2': 'ami-56e0cc35', # Sydney - 'sa-east-1': 'ami-53179e3f' # Sao Paolo + #'us-east-1': 'ami-70c2201d', # Virginia + #'us-west-2': 'ami-584a3338', # Oregon + #'us-west-1': 'ami-0ee7956e', # California + #'eu-west-1': 'ami-315bd042', # Ireland + #'eu-central-1': 'ami-ab9974c4', # Frankfurt + #'ap-southeast-1': 'ami-3c72a55f', # Singapore + #'ap-northeast-1': 'ami-da698cbb', # Tokyo + #'ap-southeast-2': 'ami-56e0cc35', # Sydney + #'sa-east-1': 'ami-53179e3f' # Sao Paolo } pre_PV_base_AMI={ - 'us-east-1': 'ami-97ff1dfa', # Virginia - 'us-west-2': 'ami-3657a556', # Oregon - 'us-west-1': 'ami-8a4039ea', # California - 'eu-west-1': 'ami-ef40cb9c', # Ireland - 'eu-central-1': 'ami-aa9974c5', # Frankfurt - 'ap-southeast-1': 'ami-d571a6b6', # Singapore - 'ap-northeast-1': 'ami-ff6a8f9e', # Tokyo - 'ap-southeast-2': 'ami-7de5c91e', # Sydney - 'sa-east-1': 'ami-bd1099d1' # Sao Paolo + #'us-east-1': 'ami-97ff1dfa', # Virginia + #'us-west-2': 'ami-3657a556', # Oregon + #'us-west-1': 'ami-8a4039ea', # California + #'eu-west-1': 'ami-ef40cb9c', # Ireland + #'eu-central-1': 'ami-aa9974c5', # Frankfurt + #'ap-southeast-1': 'ami-d571a6b6', # Singapore + #'ap-northeast-1': 'ami-ff6a8f9e', # Tokyo + #'ap-southeast-2': 'ami-7de5c91e', # Sydney + #'sa-east-1': 'ami-bd1099d1' # Sao Paolo } pre_GP2_PV_base_AMI={ - 'us-east-1': 'ami-ccff1da1', # Virginia - 'us-west-2': 'ami-c357a5a3', # Oregon - 'us-west-1': 'ami-5f4a333f', # California - 'eu-west-1': 'ami-f840cb8b', # Ireland - 'eu-central-1': 'ami-1f987570', # Frankfurt - 'ap-southeast-1': 'ami-d071a6b3', # Singapore - 'ap-northeast-1': 'ami-ba6f8adb', # Tokyo - 'ap-southeast-2': 'ami-39e6ca5a', # Sydney - 'sa-east-1': 'ami-8b159ce7' # Sao Paolo + #'us-east-1': 'ami-ccff1da1', # Virginia + #'us-west-2': 'ami-c357a5a3', # Oregon + #'us-west-1': 'ami-5f4a333f', # California + #'eu-west-1': 'ami-f840cb8b', # Ireland + #'eu-central-1': 'ami-1f987570', # Frankfurt + #'ap-southeast-1': 'ami-d071a6b3', # Singapore + #'ap-northeast-1': 'ami-ba6f8adb', # Tokyo + #'ap-southeast-2': 'ami-39e6ca5a', # Sydney + #'sa-east-1': 'ami-8b159ce7' # Sao Paolo } pre_HVM_atomic_AMI={ - 'us-east-1': 'ami-7d1a6c18', # Virginia - 'us-west-2': 'ami-c5f5eaf5', # Oregon - 'us-west-1': 'ami-2945806d', # California - 'eu-west-1': 'ami-b5b895c2', # Ireland - 'eu-central-1': 'ami-b28eb0af', # Frankfurt - 'ap-southeast-1': 'ami-9e9683cc', # Singapore - 'ap-northeast-1': 'ami-28d04628', # Tokyo - 'ap-southeast-2': 'ami-2f165815', # Sydney - 'sa-east-1': 'ami-9b0c9986' # Sao Paolo + #'us-east-1': 'ami-7d1a6c18', # Virginia + #'us-west-2': 'ami-c5f5eaf5', # Oregon + #'us-west-1': 'ami-2945806d', # California + #'eu-west-1': 'ami-b5b895c2', # Ireland + #'eu-central-1': 'ami-b28eb0af', # Frankfurt + #'ap-southeast-1': 'ami-9e9683cc', # Singapore + #'ap-northeast-1': 'ami-28d04628', # Tokyo + #'ap-southeast-2': 'ami-2f165815', # Sydney + #'sa-east-1': 'ami-9b0c9986' # Sao Paolo } pre_GP2_HVM_atomic_AMI={ - 'us-east-1': 'ami-bf1d6bda', # Virginia - 'us-west-2': 'ami-e9f5ead9', # Oregon - 'us-west-1': 'ami-23458067', # California - 'eu-west-1': 'ami-c7b895b0', # Ireland - 'eu-central-1': 'ami-ac8eb0b1', # Frankfurt - 'ap-southeast-1': 'ami-909683c2', # Singapore - 'ap-northeast-1': 'ami-12d54312', # Tokyo - 'ap-southeast-2': 'ami-3716580d', # Sydney - 'sa-east-1': 'ami-9d0c9980' # Sao Paolo + #'us-east-1': 'ami-bf1d6bda', # Virginia + #'us-west-2': 'ami-e9f5ead9', # Oregon + #'us-west-1': 'ami-23458067', # California + #'eu-west-1': 'ami-c7b895b0', # Ireland + #'eu-central-1': 'ami-ac8eb0b1', # Frankfurt + #'ap-southeast-1': 'ami-909683c2', # Singapore + #'ap-northeast-1': 'ami-12d54312', # Tokyo + #'ap-southeast-2': 'ami-3716580d', # Sydney + #'sa-east-1': 'ami-9d0c9980' # Sao Paolo } From f53d7cd5a7ff97bddbc1d19ce76e3245df632268 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Jul 12 2016 20:55:09 +0000 Subject: [PATCH 9/9] Reintroduce (and fix) the ami pattern for fedora-atomic. --- diff --git a/getfedora.org/build/fedimg_vars.py b/getfedora.org/build/fedimg_vars.py index 3b397d5..14d584d 100755 --- a/getfedora.org/build/fedimg_vars.py +++ b/getfedora.org/build/fedimg_vars.py @@ -81,10 +81,10 @@ def collect(release): 'PV_base_AMI': lambda e: e.get('virt_type') == 'paravirtual' and e.get('vol_type') == 'standard', 'GP2_PV_base_AMI': lambda e: e.get('virt_type') == 'paravirtual' and e.get('vol_type') == 'gp2', }), - #("Fedora-Cloud-Atomic-{curr_cloud_id}-{atomic_composedate}.n.0.x86_64", { - # 'HVM_atomic_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard', - # 'GP2_HVM_atomic_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2', - #}), + ("Fedora-Atomic-{curr_cloud_AMI_id}-{atomic_composedate}.x86_64", { + 'HVM_atomic_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard', + 'GP2_HVM_atomic_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2', + }), #("Fedora-Cloud-Base-{next_cloud_AMI_id}-{pre_cloud_AMI_composedate}.n.0.x86_64", { # 'pre_HVM_base_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard', # 'pre_GP2_HVM_base_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2',