alpine: add new releases

Add new Alpine releases 3.13 and 3.14
quay · Sep 13, 2021 · 945cdf5 · 945cdf5
1 parent c0a71c6
commit 945cdf5
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 2 deletions.
diff --git a/alpine/distributionscanner.go b/alpine/distributionscanner.go
@@ -35,6 +35,14 @@ type alpineRegex struct {
 // and the issue string in the issue file
 // ex: "Welcome to Alpine Linux 3.3"
 var alpineRegexes = []alpineRegex{
+	{
+		dist:   alpine3_14Dist,
+		regexp: regexp.MustCompile(`Alpine Linux v?3\.14`),
+	},
+	{
+		dist:   alpine3_13Dist,
+		regexp: regexp.MustCompile(`Alpine Linux v?3\.13`),
+	},
 	{
 		dist:   alpine3_12Dist,
 		regexp: regexp.MustCompile(`Alpine Linux v?3\.12`),

diff --git a/alpine/distributionscanner_test.go b/alpine/distributionscanner_test.go
@@ -65,6 +65,16 @@ func TestDistributionScanner(t *testing.T) {
 			OSRelease: v3_12_OSRelease,
 			Issue:     v3_12_Issue,
 		},
+		{
+			Release:   V3_13,
+			OSRelease: v3_13_OSRelease,
+			Issue:     v3_13_Issue,
+		},
+		{
+			Release:   V3_14,
+			OSRelease: v3_14_OSRelease,
+			Issue:     v3_14_Issue,
+		},
 	}
 	for _, tt := range table {
 		t.Run(string(tt.Release), func(t *testing.T) {
@@ -164,5 +174,21 @@ PRETTY_NAME="Alpine Linux v3.12"
 HOME_URL="https://alpinelinux.org/"
 BUG_REPORT_URL="https://bugs.alpinelinux.org/"`
 	v3_12_Issue = `Welcome to Alpine Linux 3.12
+Kernel \r on an \m (\l)`
+    v3_13_OSRelease = `NAME="Alpine Linux"
+ID=alpine
+VERSION_ID=3.13.4
+PRETTY_NAME="Alpine Linux v3.13"
+HOME_URL="https://alpinelinux.org/"
+BUG_REPORT_URL="https://bugs.alpinelinux.org/"`
+	v3_13_Issue = `Welcome to Alpine Linux 3.13
+Kernel \r on an \m (\l)`
+    v3_14_OSRelease = `NAME="Alpine Linux"
+ID=alpine
+VERSION_ID=3.14.1
+PRETTY_NAME="Alpine Linux v3.14"
+HOME_URL="https://alpinelinux.org/"
+BUG_REPORT_URL="https://bugs.alpinelinux.org/"`
+	v3_14_Issue = `Welcome to Alpine Linux 3.14
 Kernel \r on an \m (\l)`
 )
diff --git a/alpine/release.go b/alpine/release.go
@@ -16,6 +16,8 @@ type Release string
 
 // These are known releases.
 const (
+	V3_14 Release = "v3.14"
+	V3_13 Release = "v3.13"
 	V3_12 Release = "v3.12"
 	V3_11 Release = "v3.11"
 	V3_10 Release = "v3.10"
@@ -54,6 +56,8 @@ var (
 	alpine3_10Dist = mkdist(3, 10)
 	alpine3_11Dist = mkdist(3, 11)
 	alpine3_12Dist = mkdist(3, 12)
+	alpine3_13Dist = mkdist(3, 13)
+	alpine3_14Dist = mkdist(3, 14)
 )
 
 func releaseToDist(r Release) *claircore.Distribution {
@@ -78,6 +82,10 @@ func releaseToDist(r Release) *claircore.Distribution {
 		return alpine3_11Dist
 	case V3_12:
 		return alpine3_12Dist
+	case V3_13:
+		return alpine3_13Dist
+	case V3_14:
+		return alpine3_14Dist
 	default:
 		// return empty dist
 		return &claircore.Distribution{}

diff --git a/alpine/updaterset.go b/alpine/updaterset.go
@@ -8,8 +8,8 @@ import (
 )
 
 var alpineMatrix = map[Repo][]Release{
-	Main:      []Release{V3_12, V3_11, V3_10, V3_9, V3_8, V3_7, V3_6, V3_5, V3_4, V3_3},
-	Community: []Release{V3_12, V3_11, V3_10, V3_9, V3_8, V3_7, V3_6, V3_5, V3_4, V3_3},
+	Main:      []Release{V3_14, V3_13, V3_12, V3_11, V3_10, V3_9, V3_8, V3_7, V3_6, V3_5, V3_4, V3_3},
+	Community: []Release{V3_14, V3_13, V3_12, V3_11, V3_10, V3_9, V3_8, V3_7, V3_6, V3_5, V3_4, V3_3},
 }
 
 func UpdaterSet(_ context.Context) (driver.UpdaterSet, error) {