github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-17 23:07:55 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #496 from ganeshmaharaj/fix-bump

Browse Source 
bump-repos: Make associated files adapt to newer bump script
This commit is contained in:
Jose Carlos Venegas Munoz
2019-05-08 18:50:28 -05:00
committed by GitHub
parent fab6527d59 ec87592415
commit 691ad2c048
2 changed files with 6 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Jenkinsfiles/release_pieline/bump.sh
View File

@@ -72,12 +72,7 @@ bump_kata() {
[ -d "${packaging_repo_dir}" ] || git clone "https://${packaging_repo}.git" "${packaging_repo_dir}"
cd "${packaging_repo_dir}/release"
[ "$branch" == "master" ] && ./update-repository-version.sh -p ksm-throttler "$new_version" "$branch"
./update-repository-version.sh -p proxy "$new_version" "$branch"
./update-repository-version.sh -p shim "$new_version" "$branch"
./update-repository-version.sh -p runtime "$new_version" "$branch"
[ "$branch" == "master" ] && ./update-repository-version.sh -p osbuilder "$new_version" "$branch"
./update-repository-version.sh -p agent "$new_version" "$branch"
./update-repository-version.sh -p "$new_version" "$branch"
}
setup() {

14
release/Makefile
View File

@@ -9,22 +9,18 @@ MK_DIR :=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
.PHONY: bump-kata-version
NEW_VERSION :=
TARGET_BRANCH ?= "master"
# Run update-repository-version.sh
# $1 : repository to bump
define BUMP_REPO
@echo "Create PR for $1 version $(NEW_VERSION)"
@$(MK_DIR)/update-repository-version.sh -p $1 $(NEW_VERSION)
@$(MK_DIR)/update-repository-version.sh -p $(NEW_VERSION) $(TARGET_BRANCH)
endef
bump-kata-version: $(REPOS)
ifeq ($(NEW_VERSION),)
$(error NEW_VERSION variable is empty, provide a version)
ifeq ($(and $(NEW_VERSION),$(TARGET_BRANCH)),)
$(error Either NEW_VERSION or TARGET_BRANCH variable is empty, provide both)
else
$(call BUMP_REPO,agent)
$(call BUMP_REPO,ksm-throttler)
$(call BUMP_REPO,osbuilder)
$(call BUMP_REPO,proxy)
$(call BUMP_REPO,runtime)
$(call BUMP_REPO,shim)
$(call BUMP_REPO)
endif