From 144be14547d9831036815534e91b99cda16cc672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= <fidencio@redhat.com>
Date: Tue, 6 Apr 2021 10:06:07 +0000
Subject: [PATCH] release: Get rid of "master"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We don't use the "master" branch for anything in
`kata-containers/kata-containers`.

Signed-off-by: Fabiano Fidêncio <fidencio@redhat.com>
(cherry picked from commit ca4dccf98013eebaaced6ba2a706000159e51281)
---
 tools/packaging/release/Makefile                          | 2 +-
 tools/packaging/release/tag_repos.sh                      | 6 +++---
 tools/packaging/release/update-repository-version_test.sh | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tools/packaging/release/Makefile b/tools/packaging/release/Makefile
index f98d837f4..0053fa8ea 100644
--- a/tools/packaging/release/Makefile
+++ b/tools/packaging/release/Makefile
@@ -9,7 +9,7 @@ MK_DIR :=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
 .PHONY: bump-kata-version
 
 NEW_VERSION :=
-TARGET_BRANCH ?= "master"
+TARGET_BRANCH ?= "main"
 
 # Run update-repository-version.sh
 # $1 : repository to bump
diff --git a/tools/packaging/release/tag_repos.sh b/tools/packaging/release/tag_repos.sh
index 1e51dbd2a..4d6f3f5c4 100755
--- a/tools/packaging/release/tag_repos.sh
+++ b/tools/packaging/release/tag_repos.sh
@@ -15,7 +15,7 @@ script_name="$(basename "${BASH_SOURCE[0]}")"
 OWNER=${OWNER:-"kata-containers"}
 PROJECT="Kata Containers"
 PUSH="${PUSH:-"false"}"
-branch="master"
+branch="main"
 readonly URL_RAW_FILE="https://raw.githubusercontent.com/${OWNER}"
 #The runtime version is used as reference of latest release
 # This is set to the right value later.
@@ -134,9 +134,9 @@ tag_repos() {
 
 		do_tag "${tag}"
 
-		if [ "${branch}" == "master" ]; then
+		if [ "${branch}" == "main" ]; then
 			if echo "${tag}" | grep -oP '.*-rc0$'; then
-				info "This is a rc0 for master - creating stable branch"
+				info "This is a rc0 for main - creating stable branch"
 				stable_branch=$(echo ${tag} | awk 'BEGIN{FS=OFS="."}{print $1 "." $2}')
 				stable_branch="stable-${stable_branch}"
 				info "creating branch ${stable_branch} for ${repo}"
diff --git a/tools/packaging/release/update-repository-version_test.sh b/tools/packaging/release/update-repository-version_test.sh
index d86dee8df..9242fd122 100755
--- a/tools/packaging/release/update-repository-version_test.sh
+++ b/tools/packaging/release/update-repository-version_test.sh
@@ -49,6 +49,6 @@ OK
 
 echo "Local update version update should work"
 new_version="50.0.0-rc0"
-out=$("${script_dir}/update-repository-version.sh" "${new_version}" "master" 2>&1)
+out=$("${script_dir}/update-repository-version.sh" "${new_version}" "main" 2>&1)
 output_should_contain "${out}" "release: Kata Containers ${new_version}"
 OK