diff --git a/tools/packaging/release/README.md b/tools/packaging/release/README.md index d3ffce1b06..d2f1a4446f 100644 --- a/tools/packaging/release/README.md +++ b/tools/packaging/release/README.md @@ -31,37 +31,24 @@ $ ./update-repository-version.sh -h ### Update Kata projects to a new version -Kata Containers is divided into multiple projects. With each release, all -project versions are updated to keep the version consistent. - -To update all versions for all projects, use the following: +To update project version for Kata Containers, use the following: ```bash $ make bump-kata-version NEW_VERSION= ``` The makefile target `bump-kata-version` creates a GitHub pull request in the -Kata repositories. These pull requests are tested by the Kata CI to ensure the +kata-containers repository. The pull request is tested by the Kata CI to ensure the entire project is working prior to the release. Next, the PR is approved and merged by Kata Containers members. ### `tag_repos.sh` -After all the Kata repositories are updated with a new version, they need to be +After Kata Containers repository is updated with a new version, it needs to be tagged. -The `tag_repos.sh` script is used to create tags for the Kata Containers -repositories. This script ensures that all the repositories are in the same -version (by checking the `VERSION` file). - +The `tag_repos.sh` script is used to create tags for the Kata Containers repository. The script creates an **annotated tag** for the new release version for the following repositories: -- agent -- proxy -- runtime -- shim -- throttler - -The script also tags the tests and osbuilder repositories to make it clear which -versions of these supporting repositories are used for the release. +- kata-containers diff --git a/tools/packaging/release/tag_repos.sh b/tools/packaging/release/tag_repos.sh index e3e6f07298..e8878d9264 100755 --- a/tools/packaging/release/tag_repos.sh +++ b/tools/packaging/release/tag_repos.sh @@ -68,15 +68,6 @@ info() { } repos=( - "agent" - "documentation" - "ksm-throttler" - "osbuilder" - "packaging" - "proxy" - "runtime" - "shim" - "tests" "kata-containers" ) @@ -208,7 +199,7 @@ main () { subcmd=${1:-""} shift || true - kata_version=$(curl -Ls "${URL_RAW_FILE}/runtime/${branch}/VERSION" | grep -v -P "^#") + kata_version=$(curl -Ls "${URL_RAW_FILE}/kata-containers/${branch}/VERSION" | grep -v -P "^#") [ -z "${subcmd}" ] && usage && exit 0 diff --git a/tools/packaging/release/tag_repos_test.sh b/tools/packaging/release/tag_repos_test.sh index be41c90b86..51c08c9145 100755 --- a/tools/packaging/release/tag_repos_test.sh +++ b/tools/packaging/release/tag_repos_test.sh @@ -16,10 +16,10 @@ echo "Check tag_repos.sh -h option" ./release/tag_repos.sh -h | grep Usage echo "Check tag_repos.sh status" -./release/tag_repos.sh status | grep runtime +./release/tag_repos.sh status | grep kata-containers echo "Check tag_repos.sh pre-release" -./release/tag_repos.sh pre-release $(curl -sL https://raw.githubusercontent.com/kata-containers/runtime/master/VERSION) | grep "Not checking runtime" +./release/tag_repos.sh pre-release $(curl -sL https://raw.githubusercontent.com/kata-containers/kata-containers/2.0-dev/VERSION) | grep "Not checking runtime" echo "Check tag_repos.sh pre-release with invalid information" ./release/tag_repos.sh pre-release 1000000 | grep "ERROR" || true diff --git a/tools/packaging/release/update-repository-version.sh b/tools/packaging/release/update-repository-version.sh index 003e40437c..4651b4cf88 100755 --- a/tools/packaging/release/update-repository-version.sh +++ b/tools/packaging/release/update-repository-version.sh @@ -164,16 +164,7 @@ EOT } repos=( - "agent" - "documentation" "kata-containers" - "ksm-throttler" - "osbuilder" - "packaging" - "proxy" - "runtime" - "shim" - "tests" ) main(){