Skip to content

Commit 3ea381d

Browse files
dcearaalmusil
authored andcommitted
ci: ovn-kubernetes: Move our CI jobs to OVN-K release-1.2 branch.
This is the latest stable release branch ovn-kubernetes supports since the v1.2.0 release: https://github.com/ovn-kubernetes/ovn-kubernetes/releases/tag/v1.2.0 This release is the first ovnk release that uses OVN's transit routers so it's interesting for us to use its tests. Unfortunately we also had to do a minor change in the helper that detects with golang version needs to be installed. We used to use what is stored in ovnk's go.mod file but on branch release-1.2 that points to 1.24.0. If we use the value as is eventually the job will try to pull the quay.io/projectquay/golang:1.24.0 image. That doesn't exist. It turns out a better way to detect the golang version is to look at dist/images/Makefile. It's still not bullet proof and it might change in the future but likely not on ovnk's stable release branch. It seems to work for now. Signed-off-by: Dumitru Ceara <dceara@redhat.com> Signed-off-by: Ales Musil <amusil@redhat.com> (cherry picked from commit 6ff153d)
1 parent 18516f8 commit 3ea381d

2 files changed

Lines changed: 3 additions & 2 deletions

File tree

.ci/ovn-kubernetes/prepare.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ env_path=$2
77
topdir=$PWD
88

99
function extract_go_version() {
10-
go mod edit -json go-controller/go.mod | jq -r .Go
10+
grep -E 'GO_VERSION \?= [0-9]\.[0-9\.]*$' dist/images/Makefile \
11+
| awk '{print $3}' | tr -d '"'
1112
}
1213

1314
function extract_k8s_version() {

.github/workflows/ovn-kubernetes.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ concurrency:
1313
cancel-in-progress: true
1414

1515
env:
16-
OVNKUBE_COMMIT: "release-1.1"
16+
OVNKUBE_COMMIT: "release-1.2"
1717
KIND_CLUSTER_NAME: ovn
1818
KIND_INSTALL_INGRESS: true
1919
KIND_ALLOW_SYSTEM_WRITES: true

0 commit comments

Comments
 (0)