From a52b4e559299823b5c5fc3134ca6cccee151f8ef Mon Sep 17 00:00:00 2001 From: Dumitru Ceara Date: Thu, 21 Mar 2024 15:16:07 +0100 Subject: [PATCH 1/2] Use OVS main branch. The Open vSwitch project changed the default branch to "main". Signed-off-by: Dumitru Ceara --- do.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/do.sh b/do.sh index ef2845ab..ec02b747 100755 --- a/do.sh +++ b/do.sh @@ -177,7 +177,7 @@ function clone_component() { # OVS/OVN env vars ovs_repo="${OVS_REPO:-https://github.com/openvswitch/ovs.git}" -ovs_branch="${OVS_BRANCH:-master}" +ovs_branch="${OVS_BRANCH:-main}" ovn_repo="${OVN_REPO:-https://github.com/ovn-org/ovn.git}" ovn_branch="${OVN_BRANCH:-main}" From da246021420c865657f78025204d85b9c708d657 Mon Sep 17 00:00:00 2001 From: Dumitru Ceara Date: Thu, 21 Mar 2024 15:17:36 +0100 Subject: [PATCH 2/2] README: Mention "main" branches as that's what we clone. Signed-off-by: Dumitru Ceara --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 095d2ee4..1f274511 100644 --- a/README.md +++ b/README.md @@ -155,7 +155,7 @@ cd ~/ovn-heater ``` This step will: -- clone OVS, OVN and ovn-fake-multinode upstream master branches in the +- clone OVS, OVN and ovn-fake-multinode upstream main branches in the `runtime` directory. - build the `ovn/ovn-multi-node` container image which will be used by the fake nodes spawned during the tests. OVS/OVN binaries are built with