#760 alt: fix cloud AMI ids in
Merged 6 years ago by robyduck. Opened 6 years ago by dustymabe.
dustymabe/fedora-websites dusty-f27  into  f27

@@ -44,7 +44,7 @@ 

          # The F22 released AMIs uploads didn't appear to go through fedimg, so

          # we can't use this scheme for them.  Stuff for F23 should all go that

          # route though, so we can hopefully switch over soon.

-         ("Fedora-Cloud-Base-{curr_cloud_AMI_id}-{RC_gold_AMI}.x86_64", {

+         ("Fedora-Cloud-Base-{curr_cloud_AMI_id}-{RC_gold}.x86_64", {

              'HVM_base_AMI':     lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'standard',

              'GP2_HVM_base_AMI': lambda e: e.get('virt_type') == 'hvm' and e.get('vol_type') == 'gp2',

          }),

file modified
+1 -2
@@ -23,7 +23,7 @@ 

      'curr_cloud_id': '27',

      'curr_atomic_id': '26',

      'curr_server_id': '26',

-     'curr_cloud_AMI_id': '26',

+     'curr_cloud_AMI_id': '27',

      'next_arm_id': '28',

      'next_alt_id': '28',

      'next_cloud_id': '28',
@@ -53,7 +53,6 @@ 

      'pre_cloud_AMI_atomic_composedate': '20150915',

      'RC_gold': '1.6',             # insert the number of the RC version declared GOLD

      'RC_server_gold': '1.5',      # insert the number of the RC version declared GOLD

-     'RC_gold_AMI': '1.5',         # we do this for late AMIs

      'RC_build': '1.6',            # sometimes releng use the RC build

      'RC_gold_aarch64': '1.6',     # RC Gold for aarch64

      'RC_gold_ppc64': '1.6',       # RC Gold for ppc64

  • c2e755a: Revert "no AMI prerelease and set a variable to make websites build when we have late AMIs"
  • 7429df0: move cloud ami vars to f27
  • aa2c405: alt: don't query for pre-release cloud AMIs

3 new commits added

  • alt: don't query for pre-release cloud AMIs
  • alt: move cloud ami vars to f27
  • Revert "no AMI prerelease and set a variable to make websites build when we have late AMIs"
6 years ago

Pull-Request has been merged by robyduck

6 years ago