Skip to content

Commit 07f5a24

Browse files
authored
Update branch references in kubeflow repo based the new release (#583)
1 parent 7245828 commit 07f5a24

8 files changed

+21
-21
lines changed

.github/scripts/create-release.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ set -euo pipefail
2626
# recent commit will be used.
2727
# git branch -r returns branches in the form of <remote>/<branch>
2828
# examples:
29-
# origin/v1.9-branch : match
30-
# origin/main : no match
29+
# origin/v1.10-branch : match
30+
# origin/main : no match
3131
#
3232
# Arguments:
3333
# $1 : Release branch to use if provided.
@@ -72,7 +72,7 @@ _get_latest_release_tag()
7272
# This determination is critical in being able to properly auto-increment the release name. See comments on _get_target_release_json() for further details.
7373
#
7474
# Arguments:
75-
# $1 : Branch prefix that is being used to create the new release. kubeflow names branches like 'v1.9-branch'. The branch prefix would then be expected to be 'v1.9'
75+
# $1 : Branch prefix that is being used to create the new release. kubeflow names branches like 'v1.10-branch'. The branch prefix would then be expected to be 'v1.10'
7676
# $2 : Tag name corresponding to the most recent published release
7777
#
7878
# Returns:
@@ -103,13 +103,13 @@ _same_branch_as_prior_release()
103103
# If a release name is provided in the arguments, it is used as-is without any further computation. However, if a release name is not provided, this function will
104104
# analyze the state of the release branch as well as the most recent published release tag, to determine the appropriate auto-incrementing strategy. Consider the
105105
# following scenarios:
106-
# _get_target_release_json "v1.9-branch" ""
106+
# _get_target_release_json "v1.10-branch" ""
107107
# In this case, the most recent published release is retrieved, and, based on _same_branch_as_prior_release():
108-
# - if the most recent published release is associated with the release branch, the {release} segment of the name is incremented by 1 (ex: v1.9.0-5 to v1.9.0-6)
109-
# - if the most recent published release is not associated with the release branch, release name is "reset" based on the branch (ex: v1.9.0-1)
108+
# - if the most recent published release is associated with the release branch, the {release} segment of the name is incremented by 1 (ex: v1.10.0-5 to v1.10.0-6)
109+
# - if the most recent published release is not associated with the release branch, release name is "reset" based on the branch (ex: v1.10.0-1)
110110
#
111-
# _get_target_release_json "v1.9-branch" "v1.9.0-5"
112-
# In this case, the release name is simply the provided 'v1.9.0-5' argument. If this release already exists, the script will subsequently error.
111+
# _get_target_release_json "v1.10-branch" "v1.10.0-5"
112+
# In this case, the release name is simply the provided 'v1.10.0-5' argument. If this release already exists, the script will subsequently error.
113113
#
114114
# Generally speaking, it should not be necessary to provide the $2 argument unless under extraordinary circumstances.
115115
#

.github/workflows/code-quality.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Code static analysis
55
pull_request:
66
branches:
77
- main
8-
- v1.9-branch
8+
- v1.10-branch
99
workflow_dispatch:
1010

1111
permissions:

.github/workflows/kubeflow-release.yaml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ env:
1515
CREATE_NEW_RELEASE: ${{ inputs.release-type == 'Release' }}
1616
REPO_OWNER: opendatahub-io
1717
REPO_NAME: kubeflow
18-
BRANCH_NAME: v1.9-branch
18+
BRANCH_NAME: v1.10-branch
1919

2020
jobs:
21-
# 1. Sync changes to opendatahub:v1.9-branch from opendatahub:main
21+
# 1. Sync changes to opendatahub:v1.10-branch from opendatahub:main
2222
sync-main-to-release-branch:
2323
uses: opendatahub-io/kubeflow/.github/workflows/sync-branches.yaml@main
2424
with:
2525
source: "main"
26-
target: "v1.9-branch"
26+
target: "v1.10-branch"
2727

2828
# 2. Poll for images to be available on quay.io the readiness of the images usually takes ~10 mins
2929
wait-images-are-ready-on-quay:
@@ -46,8 +46,8 @@ jobs:
4646
4747
# Images to check
4848
IMAGES=(
49-
"quay.io/opendatahub/kubeflow-notebook-controller:1.9-${GIT_HASH}"
50-
"quay.io/opendatahub/odh-notebook-controller:1.9-${GIT_HASH}"
49+
"quay.io/opendatahub/kubeflow-notebook-controller:1.10-${GIT_HASH}"
50+
"quay.io/opendatahub/odh-notebook-controller:1.10-${GIT_HASH}"
5151
)
5252
5353
# Sleep for 5 minutes before starting polling
@@ -84,7 +84,7 @@ jobs:
8484
if: ${{ needs.wait-images-are-ready-on-quay.outputs.images_ready == 'true' }}
8585
uses: opendatahub-io/kubeflow/.github/workflows/notebook-controller-images-updater.yaml@main
8686
with:
87-
branch-name: "v1.9-branch"
87+
branch-name: "v1.10-branch"
8888
organization: "opendatahub-io"
8989
generate-pr: "true"
9090
secrets:
@@ -146,4 +146,4 @@ jobs:
146146
if: ${{ needs.check-pr-merged.outputs.pr_merged == 'true' && inputs.release-type == 'Release' }}
147147
uses: opendatahub-io/kubeflow/.github/workflows/create-release.yaml@main
148148
with:
149-
target_branch: "v1.9-branch"
149+
target_branch: "v1.10-branch"

.github/workflows/notebook_controller_integration_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- v1.9-branch
7+
- v1.10-branch
88
paths:
99
- .github/workflows/notebook_controller_integration_test.yaml
1010
- components/notebook-controller/**

.github/workflows/notebook_controller_unit_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- v1.9-branch
7+
- v1.10-branch
88
paths:
99
- .github/workflows/notebook_controller_unit_test.yaml
1010
- components/notebook-controller/**

.github/workflows/odh_notebook_controller_integration_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- v1.9-branch
7+
- v1.10-branch
88
paths:
99
- .github/workflows/odh_notebook_controller_integration_test.yaml
1010
- components/notebook-controller/**

.github/workflows/odh_notebook_controller_unit_test.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on:
44
pull_request:
55
branches:
66
- main
7-
- v1.9-branch
7+
- v1.10-branch
88
paths:
99
- .github/workflows/odh_notebook_controller_unit_test.yaml
1010
- components/odh-notebook-controller/**

components/notebook-controller/generate-metadata-yaml.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
## - version attribute of 'releases' element at index 0
4545
## - defaults to a value derived from contents of ./releasing/version/VERSION
4646
## - 1st line of VERSION is read, and any leading 'v' character is removed from content
47-
## - ex: v1.9.0 -> 1.9.0
47+
## - ex: v1.10.0 -> 1.10.0
4848
## - [optional] -r <repoUrl>
4949
## - repoUrl attribute of 'releases' element at index 0
5050
## - defaults to a value derived from the 'repo' attribute of ./components/notebook-controller/PROJECT

0 commit comments

Comments
 (0)