From d9e50e2ad0856dec71389fb264c7e3617945b9cb Mon Sep 17 00:00:00 2001 From: Kashif Khan Date: Thu, 27 Apr 2023 14:50:47 +0300 Subject: [PATCH] Add release-1.4 related changes --- Makefile | 4 ++-- README.md | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index dee8cadebd..e116fce982 100644 --- a/Makefile +++ b/Makefile @@ -483,12 +483,12 @@ delete-examples: ## Release ## -------------------------------------- -## latest git tag for the commit, e.g., v1.3.0 +## latest git tag for the commit, e.g., v1.4.0 RELEASE_TAG ?= $(shell git describe --abbrev=0 2>/dev/null) ifneq (,$(findstring -,$(RELEASE_TAG))) PRE_RELEASE=true endif -# the previous release tag, e.g., v1.3.0, excluding pre-release tags +# the previous release tag, e.g., v1.4.0, excluding pre-release tags PREVIOUS_TAG ?= $(shell git tag -l | grep -E "^v[0-9]+\.[0-9]+\.[0-9]+$$" | sort -V | grep -B1 $(RELEASE_TAG) | head -n 1 2>/dev/null) RELEASE_DIR := out RELEASE_NOTES_DIR := releasenotes diff --git a/README.md b/README.md index bb06a0145d..be3a229c98 100644 --- a/README.md +++ b/README.md @@ -23,6 +23,8 @@ cluster on top of bare metal infrastructure using Metal3. | v1beta1 | v1beta1 | v1.1.X | v1.1.X       | | v1beta1 | v1beta1 | v1.2.X | v1.2.X       | | v1beta1 | v1beta1 | v1.3.X | v1.3.X       | +| v1beta1 | v1beta1 | v1.4.X | v1.4.X       | + ## Deploying the metal3 provider @@ -53,7 +55,7 @@ provider: You can also specify the provider version by appending a version tag to the provider name as follows: ```shell - clusterctl init --infrastructure metal3:v1.3.0 + clusterctl init --infrastructure metal3:v1.4.0 ``` 1. Deploy Baremetal Operator manifests and CRDs. You need to install cert-manager for Baremetal Operator, @@ -133,6 +135,11 @@ Or use parallel prefix `parallel-` for faster tests. Note that these tests run i - **/parallel-test-ubuntu-e2e-feature-main** runs e2e feature tests in parallel with CAPM3 API version v1beta1 and branch main on Ubuntu - **/parallel-test-centos-e2e-feature-main** runs e2e feature tests in parallel with CAPM3 API version v1beta1 and branch main on CentOS +Release-1.4 branch: + +- **/test-ubuntu-e2e-feature-release-1-4** runs e2e feature tests with CAPM3 API version v1beta1 and branch release-1.4 on Ubuntu +- **/test-centos-e2e-feature-release-1-4** runs e2e feature tests with CAPM3 API version v1beta1 and branch release-1.4 on CentOS + Release-1.3 branch: - **/test-ubuntu-e2e-feature-release-1-3** runs e2e feature tests with CAPM3 API version v1beta1 and branch release-1.3 on Ubuntu