Skip to content

Conversation

@wking
Copy link
Member

@wking wking commented Dec 3, 2019

Catching up with openshift/installer@3c056215376 (openshift/installer#2666). Generated with:

$ git --no-pager log -1 --oneline origin/release-4.3 -- data/data/rhcos.json
3c0562153 (origin/pr/2666) RHCOS: Bump to 43.81.201911192044.0 for CRI-O bug fix
$ git cat-file -p 3c056215376:data/data/rhcos.json | jq -r '.amis | to_entries | sort_by(.key)[] | "\n|`" + .key + "`\n|`" + .value.hvm + "`"'

and pasting the output into the module doc.

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Dec 3, 2019
@kalexand-rh kalexand-rh added this to the Future Release milestone Dec 3, 2019
@kalexand-rh
Copy link
Contributor

@jianlinliu, do you agree?

…1911221453.0

Catching up with openshift/installer@d21e41f27 (rhcos: Bump to
43.81.201911221453.0, 2019-11-22, openshift/installer#2724).

Generated with:

  $ date --iso=m --utc
  2019-12-04T23:48+0000
  $ git fetch origin
  $ git --no-pager log -1 --oneline origin/release-4.3 -- data/data/rhcos.json
  d21e41f27 (origin/pr/2724) rhcos: Bump to 43.81.201911221453.0
  $ git cat-file -p d21e41f27:data/data/rhcos.json | jq -r '.amis | to_entries | sort_by(.key)[] | "\n|`" + .key + "`\n|`" + .value.hvm + "`"'

and pasting the output into the module doc.
@wking wking changed the title modules/installation-aws-user-infra-rhcos-ami: Bump to RHCOS 43.81.201911192044.0 modules/installation-aws-user-infra-rhcos-ami: Bump to RHCOS 43.81.201911221453.0 Dec 4, 2019
@wking
Copy link
Member Author

wking commented Dec 4, 2019

Bumped to catch up with a newer installer PR (not sure how I missed this one earlier, must not have pulled origin).

$ date --iso=m --utc
2019-12-04T23:48+0000
$ git fetch origin
$ git --no-pager log -1 --oneline origin/release-4.3 -- data/data/rhcos.json
d21e41f27 (origin/pr/2724) rhcos: Bump to 43.81.201911221453.0

wking added a commit to wking/openshift-release that referenced this pull request Dec 5, 2019
…i*: Switch on BRANCH for RHCOS AMI

As discussed in dc26075 (ci-operator/templates/openshift/installer:
Bump AWS UPI to RHCOS 43.81.201911221453.0, 2019-12-02, openshift#6192), we
want a way to switch on the z stream when selecting the RHCOS AMI.  We
amight also need this if other parts of the recommended
user-provided-infrastructure flow diverge between z streams, although
at the moment the AMI is the only divergence.

In this commit, I'm sourcing my AMIs with:

  $ git cat-file -p origin/release-4.1:data/data/rhcos.json | jq -r '.amis["us-east-1"].hvm'
  ami-046fe691f52a953f9
  $ git cat-file -p origin/release-4.2:data/data/rhcos.json | jq -r '.amis["us-east-1"].hvm'
  ami-01e7fdcb66157b224
  $ git cat-file -p origin/release-4.3:data/data/rhcos.json | jq -r '.amis["us-east-1"].hvm'
  ami-014ce8846db8b463d
  $ git cat-file -p origin/master:data/data/rhcos.json | jq -r '.amis["us-east-1"].hvm'
  ami-014ce8846db8b463d

as the installer stood at 2019-12-04T23:30Z.  Comparing with the user-facing docs:

  $ git --no-pager grep -hA1 us-east-1 origin/enterprise-4.1:modules/installation-aws-user-infra-rhcos-ami.adoc
  |`us-east-1`
  |`ami-046fe691f52a953f9`
  $ git --no-pager grep -hA1 us-east-1 origin/enterprise-4.2:modules/installation-aws-user-infra-rhcos-ami.adoc
  |`us-east-1`
  |`ami-01e7fdcb66157b224`
  $ git --no-pager grep -hA1 us-east-1 origin/enterprise-4.3:modules/installation-aws-user-infra-rhcos-ami.adoc
  |`us-east-1`
  |`ami-01e7fdcb66157b224`
  $ git --no-pager grep -hA1 us-east-1 origin/enterprise-4.4:modules/installation-aws-user-infra-rhcos-ami.adoc
  fatal: Invalid object name 'origin/enterprise-4.4'.
  $ git --no-pager grep -hA1 us-east-1 origin/master:modules/installation-aws-user-infra-rhcos-ami.adoc
  |`us-east-1`
  |`ami-01e7fdcb66157b224`

So we currently diverge for 4.3 and master, where I have [1,2] open to
close the gaps.

The BRANCH environment variable has been around since 22e30ea (The
release promotion periodic can be conditional and no-op if no change,
2019-04-30, openshift#3649).  I added it to all jobs based on the UPI template
where it was missing (it was already on a number of those jobs).

[1]: openshift/openshift-docs#18396
[2]: openshift/openshift-docs#18395
@jianlinliu
Copy link

LGTM.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

branch/enterprise-4.3 size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants