Merge ~virtustom/ubuntu-docker-images/+git/utils:main into ~ubuntu-docker-images/ubuntu-docker-images/+git/utils:main

[Tomáš Virtus]

tag-images.sh: Tag latest/edge shorthand tags
Currently we don't update latest/edge shorthand tags. There's a plan
to implement tagging similar to snaps[1]. In the meantime, update
latest/edge tags according to the following rules:
  If the repository is 'lts',
    set both 'latest' and 'edge' tags to the latest LTS release.
  If the repository is 'ubuntu',
    set 'latest' tag to the latest stable release and
    set 'edge' tag to the devel release.
[1] https://snapcraft.io/docs/release-management

JIRA issue: https://warthogs.atlassian.net/browse/ROCKS-13

Valentin has more plans with regard to tagging channels similar to snaps, but he agreed that in the meantime the rules for tagging edge/latest are fine. I think it's not pretty (opinions welcome!).

I've tested it in my personal Docker Hub repository (https://hub.docker.com/r/ubuvirtus/ubuntu) with existing tags:

21.10
impish
impish-21.10_edge
20.04_edge
20.04_candidate
20.04_beta
20.04_stable
20.04
focal-20.04_edge
18.04_stable
bionic
bionic-18.04_edge
hirsute-21.04_edge

and command line (code changed to accept ubuvirtus):

  ./tag-images.sh -r docker -n ubuvirtus -- ubuntu

When I change the added comparison to check for 'ubuvirtus' instead of 'ubuntu', the output is:

I: Invoking multi-arch tagger for ubuvirtus/ubuntu:21.10_edge (source tag: impish-21.10_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/edge (source tag: impish-21.10_edge) (on docker)
I: Not adding stable/beta/candidate tags to current devel release impish
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:18.04 (source tag: bionic-18.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:18.04_edge (source tag: bionic-18.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:18.04_beta (source tag: bionic-18.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:18.04_candidate (source tag: bionic-18.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:focal (source tag: focal-20.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:hirsute (source tag: hirsute-21.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:21.04 (source tag: hirsute-21.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:21.04_edge (source tag: hirsute-21.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/latest (source tag: hirsute-21.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:21.04_stable (source tag: hirsute-21.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:21.04_beta (source tag: hirsute-21.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:21.04_candidate (source tag: hirsute-21.04_edge) (on docker)

When I change the added comparison to check for 'ubuvirtus' instead of 'lts', the output is:

I: Invoking multi-arch tagger for ubuvirtus/ubuntu:hirsute (source tag: hirsute-21.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:21.04 (source tag: hirsute-21.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:21.04_edge (source tag: hirsute-21.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:21.04_stable (source tag: hirsute-21.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:21.04_beta (source tag: hirsute-21.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:21.04_candidate (source tag: hirsute-21.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:18.04 (source tag: bionic-18.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:18.04_edge (source tag: bionic-18.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:18.04_beta (source tag: bionic-18.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:18.04_candidate (source tag: bionic-18.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:focal (source tag: focal-20.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/latest (source tag: focal-20.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/edge (source tag: focal-20.04_edge) (on docker)
I: Invoking multi-arch tagger for ubuvirtus/ubuntu:21.10_edge (source tag: impish-21.10_edge) (on docker)
I: Not adding stable/beta/candidate tags to current devel release impish

[Thomas Bechtold (toabctl)]

review: Approve

[Sergio Durigan Junior (sergiodj)]

Thanks for the MP, Tomasz.

I'm leaving a few comments regarding style, and that's the only reason why I'm marking this as "Needs Fixing". But otherwise, I don't have anything particular to add to the code. I just would like to point out that this code is relying heavily on "distro-info", so you will need to stay on top of it and make sure that it's up-to-date as soon as a new release is out.

Thanks.

review: Needs Fixing

[Tomáš Virtus (virtustom)]

Duly noted and all code comments should be addressed in latest commit. Tested again as in description with same result.

You are right about distro-info and it actually fails after the date of latest entry in the CSV file (/usr/share/distro-info/ubuntu.csv) gets out of date when invoked with --devel. I'll address this in later commit. Set as WIP for now.

[Sergio Durigan Junior (sergiodj)]

Thanks for addressing the comments, Tomas.

FWIW, my comment regarding distro-info was more of a heads-up; I'm not expecting you to address this problem in this MP (I'd actually prefer if you filed a separate MP for that).

I'm approving this one, let me know if I should merge it as is :-).

Thanks.

review: Approve

[Tomáš Virtus (virtustom)]

Sorry for the delay. I had another onboarding task. Tested again with '-eq' instead of '=' with same results as in description.

[Sergio Durigan Junior (sergiodj)]

Awesome, thank you.

diff --git a/tag-images.sh b/tag-images.sh
index 0f90f5d..92ccaf3 100755
--- a/tag-images.sh
+++ b/tag-images.sh
@@ -125,8 +125,10 @@ do_tag_base_ubuntu_image ()
 
     local -a IMAGE_TAGS EDGE_TAGS
 
-    local DISTRONAME_DEVEL
+    local DISTRONAME_DEVEL DISTRONAME_STABLE DISTRONAME_LTS
     DISTRONAME_DEVEL=$(distro-info --devel)
+    DISTRONAME_STABLE=$(distro-info --stable)
+    DISTRONAME_LTS=$(distro-info --lts)
 
     readarray -t IMAGE_TAGS < <(print_tags_for_image "${image}")
 
@@ -180,6 +182,45 @@ do_tag_base_ubuntu_image ()
 		"${IMG_RELEASEVER}_edge"
 	fi
 
+	local DO_TAG_LATEST=0 DO_TAG_EDGE=0
+
+	case "$NAMESPACE" in
+	    lts)
+		case "$IMG_DISTRONAME" in
+		    "$DISTRONAME_LTS")
+			DO_TAG_LATEST=1
+			DO_TAG_EDGE=1
+			;;
+		esac
+		;;
+	    ubuntu)
+		case "$IMG_DISTRONAME" in
+		    "$DISTRONAME_STABLE")
+			DO_TAG_LATEST=1
+			;;
+		    "$DISTRONAME_DEVEL")
+			DO_TAG_EDGE=1
+			;;
+		esac
+		;;
+	esac
+
+	if [ "$DO_TAG_LATEST" -eq 1 ]; then
+	    info "Invoking multi-arch tagger for ${NAMESPACE}/latest (source tag: ${EDGE_TAG_PREFIX}_edge) (on ${REGISTRY})"
+	    tag_image \
+		"${image}" \
+		"${EDGE_TAG_PREFIX}_edge" \
+		"latest"
+	fi
+
+	if [ "$DO_TAG_EDGE" -eq 1 ]; then
+	    info "Invoking multi-arch tagger for ${NAMESPACE}/edge (source tag: ${EDGE_TAG_PREFIX}_edge) (on ${REGISTRY})"
+	    tag_image \
+		"${image}" \
+		"${EDGE_TAG_PREFIX}_edge" \
+		"edge"
+	fi
+
 	if [ "$IMG_DISTRONAME" = "$DISTRONAME_DEVEL" ]; then
 	    info "Not adding stable/beta/candidate tags to current devel release $IMG_DISTRONAME"
 	    continue