release-controller: branch for 4.7 by droslean · Pull Request #8532 · openshift/release

droslean · 2020-04-23T18:35:14Z

generated with:

#!/bin/bash

set -o errexit
set -o nounset
set -o pipefail

export conf='core-services/release-controller/images-ocp-4.6.yaml'
sed -e 's/4.6/4.7/g' "${conf}" > "${conf/4.6/4.7}"

export conf='core-services/release-controller/rpms-ocp-4.6.yaml'
sed -e 's/4-6/4-7/g' -e 's/4.6/4.7/g' "${conf}" > "${conf/4.6/4.7}"
cp "${conf/4.6/4.7}" "clusters/build-clusters/01_cluster/openshift/release-controller/$( basename "${conf/4.6/4.7}" )"

for repo in core-services/release-controller/_repos/*4.6*; do
	sed -e 's/4.6/4.7/g' "${repo}" > "${repo/4.6/4.7}"
done

sed -i 's/base-4-6/base-4-7/g' ci-operator/config/openshift/images/openshift-images-release-4.7.yaml

for release in core-services/release-controller/_releases/release-ocp-4.6*; do
	sed -e 's/4.6/4.7/g' "${release}" > "${release/4.6/4.7}"
done

export conf="ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml"
sed -e 's/4.6/4.7/g' -e 's/4.5/4.6/g' "${conf}" > "${conf/4.6/4.7}"

git add core-services/ clusters/ ci-operator/
git commit --signoff -m "release-controller: branch for 4.7"

follow-up manual step

#!/bin/bash

set -o errexit
set -o nounset
set -o pipefail

current_release="4.6"
future_release="4.7"

for arch in '' '-s390x' '-ppc64le'; do
	oc tag "rhcos/machine-os-content:${current_release}${arch}" "rhcos/machine-os-content:${future_release}${arch}" --as system:admin
	name="$( oc get istag -n rhcos "machine-os-content:${current_release}${arch}" -o jsonpath={.image.metadata.name} )"
	oc tag "quay.io/openshift-release-dev/ocp-v4.0-art-dev@${name}" "ocp${arch}/${future_release}-art-latest${arch}:machine-os-content" --as system:admin
done

droslean · 2020-04-23T18:41:19Z

/cc @openshift/openshift-team-developer-productivity-test-platform @stevekuznetsov

stevekuznetsov · 2020-04-23T18:54:36Z

something is wrong here clients/oc/4.6/linux

hm... yea that link doesn't exist. Shall we use 4.5 ?

Signed-off-by: Nikolaos Moraitis <nmoraiti@redhat.com>

stevekuznetsov · 2020-04-27T21:33:28Z

@droslean what is the status here? Did we end up needing to change the script?

droslean · 2020-04-28T07:16:36Z

what is the status here? Did we end up needing to change the script?

No. I used the same script and replace only the versions. The script generates exactly the changes you see in this PR.

stevekuznetsov · 2020-04-28T15:33:24Z

/lgtm

openshift-ci-robot · 2020-04-28T15:33:40Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: droslean, stevekuznetsov

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~ci-operator/jobs/openshift/release/OWNERS~~ [droslean,stevekuznetsov]
~~clusters/OWNERS~~ [droslean,stevekuznetsov]
~~core-services/release-controller/OWNERS~~ [droslean,stevekuznetsov]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

droslean · 2020-04-28T17:48:16Z

/hold cancel

openshift-ci-robot · 2020-04-28T18:14:44Z

@droslean: Updated the following 5 configmaps:

base-repos configmap in namespace ocp at cluster ci/api-build01-ci-devcluster-openshift-com:6443 using the following files:
- key ocp-4.7-default.repo using file core-services/release-controller/_repos/ocp-4.7-default.repo
- key ocp-4.7-openstack-beta.repo using file core-services/release-controller/_repos/ocp-4.7-openstack-beta.repo
- key ocp-4.7-openstack.repo using file core-services/release-controller/_repos/ocp-4.7-openstack.repo
- key ocp-4.7-ppc64le.repo using file core-services/release-controller/_repos/ocp-4.7-ppc64le.repo
- key ocp-4.7-rhel8.repo using file core-services/release-controller/_repos/ocp-4.7-rhel8.repo
- key ocp-4.7-s390x.repo using file core-services/release-controller/_repos/ocp-4.7-s390x.repo
job-config-4.7 configmap in namespace ci at cluster api.ci using the following files:
- key openshift-release-release-4.7-periodics.yaml using file ci-operator/jobs/openshift/release/openshift-release-release-4.7-periodics.yaml
job-config-4.7 configmap in namespace ci at cluster app.ci using the following files:
- key openshift-release-release-4.7-periodics.yaml using file ci-operator/jobs/openshift/release/openshift-release-release-4.7-periodics.yaml
releases configmap in namespace ocp at cluster api.ci using the following files:
- key release-ocp-4.7-ci.json using file core-services/release-controller/_releases/release-ocp-4.7-ci.json
- key release-ocp-4.7-ppc64le.json using file core-services/release-controller/_releases/release-ocp-4.7-ppc64le.json
- key release-ocp-4.7-s390x.json using file core-services/release-controller/_releases/release-ocp-4.7-s390x.json
- key release-ocp-4.7.json using file core-services/release-controller/_releases/release-ocp-4.7.json
base-repos configmap in namespace ocp at cluster api.ci using the following files:
- key ocp-4.7-default.repo using file core-services/release-controller/_repos/ocp-4.7-default.repo
- key ocp-4.7-openstack-beta.repo using file core-services/release-controller/_repos/ocp-4.7-openstack-beta.repo
- key ocp-4.7-openstack.repo using file core-services/release-controller/_repos/ocp-4.7-openstack.repo
- key ocp-4.7-ppc64le.repo using file core-services/release-controller/_repos/ocp-4.7-ppc64le.repo
- key ocp-4.7-rhel8.repo using file core-services/release-controller/_repos/ocp-4.7-rhel8.repo
- key ocp-4.7-s390x.repo using file core-services/release-controller/_repos/ocp-4.7-s390x.repo

Details

In response to this:

generated with:

#!/bin/bash

set -o errexit
set -o nounset
set -o pipefail

export conf='core-services/release-controller/images-ocp-4.6.yaml'
sed -e 's/4.6/4.7/g' "${conf}" > "${conf/4.6/4.7}"

export conf='core-services/release-controller/rpms-ocp-4.6.yaml'
sed -e 's/4-6/4-7/g' -e 's/4.6/4.7/g' "${conf}" > "${conf/4.6/4.7}"
cp "${conf/4.6/4.7}" "clusters/build-clusters/01_cluster/openshift/release-controller/$( basename "${conf/4.6/4.7}" )"

for repo in core-services/release-controller/_repos/*4.6*; do
  sed -e 's/4.6/4.7/g' "${repo}" > "${repo/4.6/4.7}"
done

sed -i 's/base-4-6/base-4-7/g' ci-operator/config/openshift/images/openshift-images-release-4.7.yaml

for release in core-services/release-controller/_releases/release-ocp-4.6*; do
  sed -e 's/4.6/4.7/g' "${release}" > "${release/4.6/4.7}"
done

export conf="ci-operator/jobs/openshift/release/openshift-release-release-4.6-periodics.yaml"
sed -e 's/4.6/4.7/g' -e 's/4.5/4.6/g' "${conf}" > "${conf/4.6/4.7}"

git add core-services/ clusters/ ci-operator/
git commit --signoff -m "release-controller: branch for 4.7"

follow-up manual step

#!/bin/bash

set -o errexit
set -o nounset
set -o pipefail

current_release="4.6"
future_release="4.7"

for arch in '' '-s390x' '-ppc64le'; do
  oc tag "rhcos/machine-os-content:${current_release}${arch}" "rhcos/machine-os-content:${future_release}${arch}" --as system:admin
  name="$( oc get istag -n rhcos "machine-os-content:${current_release}${arch}" -o jsonpath={.image.metadata.name} )"
  oc tag "quay.io/openshift-release-dev/ocp-v4.0-art-dev@${name}" "ocp${arch}/${future_release}-art-latest${arch}:machine-os-content" --as system:admin
done

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Skip 4.3 and start with 4.4, instead of expecting a 4.4 -> 4.6 hop to work. Fixes a typo from the file's creation in 7228c7b (release-controller: branch for 4.7, 2020-04-23, openshift#8532).

openshift-ci-robot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Apr 23, 2020

openshift-ci-robot requested review from abhat and abhinavdahiya April 23, 2020 18:39

droslean force-pushed the release-machinery branch from 568b6cd to 1e82ba9 Compare April 23, 2020 18:40

openshift-ci-robot requested review from a team and stevekuznetsov April 23, 2020 18:41

stevekuznetsov reviewed Apr 23, 2020

View reviewed changes

droslean force-pushed the release-machinery branch from 1e82ba9 to 3b923b4 Compare April 23, 2020 19:11

release-controller: branch for 4.7

7228c7b

Signed-off-by: Nikolaos Moraitis <nmoraiti@redhat.com>

droslean force-pushed the release-machinery branch from 3b923b4 to 7228c7b Compare April 23, 2020 20:54

openshift-ci-robot assigned stevekuznetsov Apr 28, 2020

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Apr 28, 2020

openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 28, 2020

openshift-merge-robot merged commit be12c13 into openshift:master Apr 28, 2020

droslean deleted the release-machinery branch April 28, 2020 18:20

wking mentioned this pull request Oct 22, 2020

ci-operator/jobs/openshift/release: Fix 4.4 -> 4.6 in chained update #13019

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

release-controller: branch for 4.7#8532

release-controller: branch for 4.7#8532
openshift-merge-robot merged 1 commit intoopenshift:masterfrom
droslean:release-machinery

droslean commented Apr 23, 2020 •

edited

Loading

Uh oh!

droslean commented Apr 23, 2020

Uh oh!

stevekuznetsov Apr 23, 2020

Uh oh!

droslean Apr 23, 2020

Uh oh!

stevekuznetsov commented Apr 27, 2020

Uh oh!

droslean commented Apr 28, 2020

Uh oh!

stevekuznetsov commented Apr 28, 2020

Uh oh!

openshift-ci-robot commented Apr 28, 2020

Uh oh!

droslean commented Apr 28, 2020

Uh oh!

openshift-ci-robot commented Apr 28, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Conversation

droslean commented Apr 23, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

droslean commented Apr 23, 2020

Uh oh!

stevekuznetsov Apr 23, 2020

Choose a reason for hiding this comment

Uh oh!

droslean Apr 23, 2020

Choose a reason for hiding this comment

Uh oh!

stevekuznetsov commented Apr 27, 2020

Uh oh!

droslean commented Apr 28, 2020

Uh oh!

stevekuznetsov commented Apr 28, 2020

Uh oh!

openshift-ci-robot commented Apr 28, 2020

Uh oh!

droslean commented Apr 28, 2020

Uh oh!

openshift-ci-robot commented Apr 28, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

droslean commented Apr 23, 2020 •

edited

Loading