Merge pull request #11506 from smarterclayton/actually_use_correct_version_metadata

Merged by openshift-bot

Author: OpenShift Bot

hack/build-images.sh

@@ -15,7 +15,7 @@ if [[ "${OS_RELEASE:-}" == "n" ]]; then
   imagedir="${OS_OUTPUT_BINPATH}/linux/amd64"
   # identical to build-cross.sh
   os::build::os_version_vars
-  OS_RELEASE_COMMIT="${OS_GIT_SHORT_VERSION}"
+  OS_RELEASE_COMMIT="${OS_GIT_VERSION}"
   OS_BUILD_PLATFORMS=("${OS_IMAGE_COMPILE_PLATFORMS[@]-}")
 
   echo "Building images from source ${OS_RELEASE_COMMIT}:"

hack/common.sh

@@ -479,11 +479,7 @@ function os::build::place_bins() {
 readonly -f os::build::place_bins
 
 function os::build::archive_name() {
-  if [[ "${OS_GIT_VERSION}" == *+${OS_GIT_COMMIT} ]]; then
-    echo "${OS_RELEASE_ARCHIVE}-${OS_GIT_VERSION}-$1"
-    return
-  fi
-  echo "${OS_RELEASE_ARCHIVE}-${OS_GIT_VERSION}-${OS_GIT_COMMIT}-$1"
+  echo "${OS_RELEASE_ARCHIVE}-${OS_GIT_VERSION}-$1"
 }
 readonly -f os::build::archive_name
 
@@ -672,10 +668,8 @@ function os::build::os_version_vars() {
         OS_GIT_TREE_STATE="dirty"
       fi
     fi
-    OS_GIT_SHORT_VERSION="${OS_GIT_COMMIT}"
-
     # Use git describe to find the version based on annotated tags.
-    if [[ -n ${OS_GIT_VERSION-} ]] || OS_GIT_VERSION=$("${git[@]}" describe --tags --abbrev=7 "${OS_GIT_COMMIT}^{commit}" 2>/dev/null); then
+    if [[ -n ${OS_GIT_VERSION-} ]] || OS_GIT_VERSION=$("${git[@]}" describe --long --tags --abbrev=7 "${OS_GIT_COMMIT}^{commit}" 2>/dev/null); then
       # Try to match the "git describe" output to a regex to try to extract
       # the "major" and "minor" versions and whether this is the exact tagged
       # version or whether the tree is between two tagged versions.
@@ -689,16 +683,14 @@ function os::build::os_version_vars() {
 
       # This translates the "git describe" to an actual semver.org
       # compatible semantic version that looks something like this:
-      #   v1.1.0-alpha.0.6+84c76d1142ea4d
-      #
-      # TODO: We continue calling this "git version" because so many
-      # downstream consumers are expecting it there.
-      OS_GIT_VERSION=$(echo "${OS_GIT_VERSION}" | sed "s/-\([0-9]\{1,\}\)-g\([0-9a-f]\{7,40\}\)$/\+\2/")
+      #   v1.1.0-alpha.0.6+84c76d1-345
+      OS_GIT_VERSION=$(echo "${OS_GIT_VERSION}" | sed "s/-\([0-9]\{1,\}\)-g\([0-9a-f]\{7,40\}\)$/\+\2-\1/")
+      # If this is an exact tag, remove the last segment.
+      OS_GIT_VERSION=$(echo "${OS_GIT_VERSION}" | sed "s/-0$//")
       if [[ "${OS_GIT_TREE_STATE}" == "dirty" ]]; then
         # git describe --dirty only considers changes to existing files, but
         # that is problematic since new untracked .go files affect the build,
         # so use our idea of "dirty" from git status instead.
-        OS_GIT_SHORT_VERSION+="-dirty"
         OS_GIT_VERSION+="-dirty"
       fi
     fi

pkg/version/version.go

@@ -1,7 +1,6 @@
 package version
 
 import (
-	"regexp"
 	"strings"
 
 	"github.com/prometheus/client_golang/prometheus"
@@ -54,33 +53,12 @@ func (info Info) String() string {
 	return version
 }
 
-var (
-	reCommitSegment   = regexp.MustCompile(`\+[0-9a-f]{6,14}$`)
-	reCommitIncrement = regexp.MustCompile(`^[0-9a-f]+$`)
-)
-
 // LastSemanticVersion attempts to return a semantic version from the GitVersion - which
 // is either <semver>+<commit> or <semver> on release boundaries.
 func (info Info) LastSemanticVersion() string {
 	version := info.GitVersion
-	parts := strings.Split(version, "-")
-	// strip the modifier
-	if len(parts) > 1 && parts[len(parts)-1] == "dirty" {
-		parts = parts[:len(parts)-1]
-	}
-	// strip the Git commit
-	if len(parts) > 0 && reCommitSegment.MatchString(parts[len(parts)-1]) {
-		parts[len(parts)-1] = reCommitSegment.ReplaceAllString(parts[len(parts)-1], "")
-		if len(parts[len(parts)-1]) == 0 {
-			parts = parts[:len(parts)-1]
-		}
-		// strip a version increment, but only if we found the commit
-		if len(parts) > 1 && reCommitIncrement.MatchString(parts[len(parts)-1]) {
-			parts = parts[:len(parts)-1]
-		}
-	}
-
-	return strings.Join(parts, "-")
+	parts := strings.Split(version, "+")
+	return parts[0]
 }
 
 func init() {

pkg/version/version_test.go

@@ -8,14 +8,16 @@ func TestLastSemanticVersion(t *testing.T) {
 	testCases := []struct {
 		in, out string
 	}{
-		{"v1.3-11+abcdef-dirty", "v1.3"},
-		{"v1.3-11+abcdef", "v1.3"},
+		{"v1.3", "v1.3"},
+		{"v1.3+dirty", "v1.3"},
+		{"v1.3-11+abcdef-dirty", "v1.3-11"},
+		{"v1.3-11+abcdef", "v1.3-11"},
 		{"v1.3-11", "v1.3-11"},
 		{"v1.3.0+abcdef", "v1.3.0"},
 		{"v1.3+abcdef", "v1.3"},
 		{"v1.3.0-alpha.1", "v1.3.0-alpha.1"},
-		{"v1.3.0-alpha.1-dirty", "v1.3.0-alpha.1"},
-		{"v1.3.0-alpha.1+abc-dirty", "v1.3.0-alpha.1+abc"},
+		{"v1.3.0-alpha.1-dirty", "v1.3.0-alpha.1-dirty"},
+		{"v1.3.0-alpha.1+abc-dirty", "v1.3.0-alpha.1"},
 		{"v1.3.0-alpha.1+abcdef-dirty", "v1.3.0-alpha.1"},
 	}
 	for _, test := range testCases {