Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-17260 ReleaseWizard should remove old minor versions from Docker Hub (#2430)

Jan Høydahl2bb2ada0a372
diff --git a/dev-tools/scripts/releaseWizard.py b/dev-tools/scripts/releaseWizard.py
index bbfe9e802c7..dea4fb46dc5 100755
--- a/dev-tools/scripts/releaseWizard.py
+++ b/dev-tools/scripts/releaseWizard.py
@@ -110,6 +110,7 @@ def expand_jinja(text, vars=None):
'get_next_version': state.get_next_version(),
'current_git_rev': state.get_current_git_rev(),
'keys_downloaded': keys_downloaded(),
+ 'docker_version_to_remove': state.get_docker_version_to_remove(),
'editor': get_editor(),
'rename_cmd': 'ren' if is_windows() else 'mv',
'vote_close_72h': vote_close_72h_date().strftime("%Y-%m-%d %H:00 UTC"),
@@ -602,6 +603,12 @@ class ReleaseState:
return "%s.%s.%s" % (self.release_version_major, self.release_version_minor, self.release_version_bugfix + 1)
return None
+ def get_docker_version_to_remove(self):
+ if self.release_type == 'minor' and self.release_version_minor >= 2:
+ return "%s.%s" % (self.release_version_major, self.release_version_minor - 2)
+ else:
+ return None
+
def get_refguide_release(self):
return "%s_%s" % (self.release_version_major, self.release_version_minor)
diff --git a/dev-tools/scripts/releaseWizard.yaml b/dev-tools/scripts/releaseWizard.yaml
index fa65a967f6d..e44edd00ba0 100644
--- a/dev-tools/scripts/releaseWizard.yaml
+++ b/dev-tools/scripts/releaseWizard.yaml
@@ -1078,7 +1078,12 @@ groups:
comment: Add the new slim distribution Dockerfile to the repo
logfile: solr_docker_add_dockerfile_slim.log
- !Command
- cmd: 'git add {{ docker_version }}/Dockerfile {{ docker_version }}-slim/Dockerfile && git commit -m "Apache Solr release {{ release_version }}"'
+ cmd: "{% if docker_version_to_remove %}rm -rf {{ docker_version_to_remove }} {{ docker_version_to_remove }}-slim{% else %}echo Nothing to delete{% endif %}"
+ cwd: solr-docker
+ comment: "{% if docker_version_to_remove %}Mark docker image version {{ docker_version_to_remove }} as not supported{% else %}N/A - No docker versions to delete for this release{% endif %}"
+ logfile: solr_remove_old_docker_images.log
+ - !Command
+ cmd: 'git add . && git commit -m "Apache Solr release {{ release_version }}"'
cwd: solr-docker
comment: Commit the new Dockerfile
logfile: solr_docker_commit.log