From ca7ed63e1604ad6bd87f353f06b5fabef9576f60 Mon Sep 17 00:00:00 2001 From: mgreau Date: Tue, 14 Apr 2020 15:29:01 -0400 Subject: [PATCH] [script] Update bumper script to handle SNAPSHOT versions This commit updates the `bumper.py` script to handle the workflows for updating the versions to test staging artifacts and before a release, for example: - update 7.7.0-SNAPSHOT to 7.7.0 before tagging a release, by running `env BUMPER_VERSION_7="7.7.0" ./helpers/bumper.py` - update 7.7.0-SNAPHSHOT to 7.7.0-abcdefgh for testing staging artifacts by running: `env BUMPER_VERSION_7="7.7.0-abcdefgh" BUMPER_USE_STAGING_IMAGES="true" ./helpers/bumper.py` For now this script do not handle the bump from 7.7.0 to 7.7.1-SNAPSHOT for the next developement iteration after a release. In the meantime this update should be done manually. --- apm-server/README.md | 4 ++-- elasticsearch/README.md | 4 ++-- filebeat/README.md | 4 ++-- helpers/bumper.py | 3 +-- kibana/README.md | 4 ++-- logstash/README.md | 4 ++-- metricbeat/README.md | 4 ++-- 7 files changed, 13 insertions(+), 14 deletions(-) diff --git a/apm-server/README.md b/apm-server/README.md index dc3ca85d9..6eee66677 100644 --- a/apm-server/README.md +++ b/apm-server/README.md @@ -22,7 +22,7 @@ easily be overridden in the config value `apmConfig.apm-server.yml`. ## Installing -This chart is tested with the latest 7.7.x versions. +This chart is tested with the latest 7.7.0-SNAPSHOT versions. * Add the elastic helm charts repo @@ -46,7 +46,7 @@ This chart is tested with the latest 7.7.x versions. git checkout -b 7.7 origin/7.7 ``` -* Install the latest 7.7.x-SNAPSHOT +* Install the latest 7.7.0-SNAPSHOT ```bash helm install --name apm-server ./helm-charts/apm-server diff --git a/elasticsearch/README.md b/elasticsearch/README.md index 18d768785..261c15d17 100644 --- a/elasticsearch/README.md +++ b/elasticsearch/README.md @@ -48,7 +48,7 @@ If you currently have a cluster deployed with the [helm/charts stable](https://g ## Installing -This chart is tested with the latest 7.7.x versions. +This chart is tested with the latest 7.7.0-SNAPSHOT versions. * Add the elastic helm charts repo @@ -72,7 +72,7 @@ This chart is tested with the latest 7.7.x versions. git checkout -b 7.7 origin/7.7 ``` -* Install the latest 7.7.x-SNAPSHOT +* Install the latest 7.7.0-SNAPSHOT ```bash helm install --name elasticsearch ./helm-charts/elasticsearch diff --git a/filebeat/README.md b/filebeat/README.md index 860f56e02..6395e6c5f 100644 --- a/filebeat/README.md +++ b/filebeat/README.md @@ -16,7 +16,7 @@ This helm chart is a lightweight way to configure and run our official [Filebeat ## Installing -This chart is tested with the latest 7.7.x versions. +This chart is tested with the latest 7.7.0-SNAPSHOT versions. * Add the elastic helm charts repo @@ -40,7 +40,7 @@ This chart is tested with the latest 7.7.x versions. git checkout -b 7.7 origin/7.7 ``` -* Install the latest 7.7.x-SNAPSHOT +* Install the latest 7.7.0-SNAPSHOT ```bash helm install --name filebeat ./helm-charts/filebeat diff --git a/helpers/bumper.py b/helpers/bumper.py index 0ca195b0c..825672459 100755 --- a/helpers/bumper.py +++ b/helpers/bumper.py @@ -28,7 +28,6 @@ file_patterns = [ "*/examples/*/*.y*ml", "helpers/examples.mk", - "*/README.md", "*/values.y*ml", "*/Chart.y*ml", ] @@ -43,7 +42,7 @@ print("Updating versions...") for major, version in versions.iteritems(): - r = re.compile(r"{0}\.[0-9]*\.[0-9]*-?[0-9]?".format(major)) + r = re.compile(r"{0}\.[0-9]*\.[0-9]*-?(SNAPSHOT)?".format(major)) for pattern in file_patterns: for f in glob.glob(pattern): print(f) diff --git a/kibana/README.md b/kibana/README.md index ca05a9f83..de93c09e4 100644 --- a/kibana/README.md +++ b/kibana/README.md @@ -11,7 +11,7 @@ This helm chart is a lightweight way to configure and run our official [Kibana d ## Installing -This chart is tested with the latest 7.7.x versions. +This chart is tested with the latest 7.7.0-SNAPSHOT versions. * Add the elastic helm charts repo @@ -35,7 +35,7 @@ This chart is tested with the latest 7.7.x versions. git checkout -b 7.7 origin/7.7 ``` -* Install the latest 7.7.x-SNAPSHOT +* Install the latest 7.7.0-SNAPSHOT ```bash helm install --name kibana ./helm-charts/kibana diff --git a/logstash/README.md b/logstash/README.md index 7d1d5bcbb..89aedf28d 100644 --- a/logstash/README.md +++ b/logstash/README.md @@ -20,7 +20,7 @@ This helm chart is a lightweight way to configure and run our official [Logstash ## Installing -This chart is tested with the latest 7.7.x versions. +This chart is tested with the latest 7.7.0-SNAPSHOT versions. * Add the elastic helm charts repo @@ -44,7 +44,7 @@ This chart is tested with the latest 7.7.x versions. git checkout -b 7.7 origin/7.7 ``` -* Install the latest 7.7.x-SNAPSHOT +* Install the latest 7.7.0-SNAPSHOT ```bash helm install --name logstash ./helm-charts/logstash diff --git a/metricbeat/README.md b/metricbeat/README.md index e6a40f18a..511c346ba 100644 --- a/metricbeat/README.md +++ b/metricbeat/README.md @@ -25,7 +25,7 @@ The workaround is to use `--force` argument for `helm upgrade` command which wil ## Installing -This chart is tested with the latest 7.7.x versions. +This chart is tested with the latest 7.7.0-SNAPSHOT versions. * Add the elastic helm charts repo @@ -49,7 +49,7 @@ This chart is tested with the latest 7.7.x versions. git checkout -b 7.7 origin/7.7 ``` -* Install the latest 7.7.x-SNAPSHOT +* Install the latest 7.7.0-SNAPSHOT ```bash helm install --name metricbeat ./helm-charts/metricbeat