Merge branch 'avonbertoldi/39143/pulp-supported-distros' into 'main'

Implement mage pulp:supportedOSVersions  target

See merge request https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/6024

Merged-by: Vishal Tak <[email protected]>
Approved-by: Vishal Tak <[email protected]>
Reviewed-by: Vishal Tak <[email protected]>
Reviewed-by: GitLab Duo <[email protected]>
Co-authored-by: Axel von Bertoldi <[email protected]>

Author: Vishal Tak

go.mod

@@ -92,6 +92,7 @@ require (
 	google.golang.org/grpc v1.75.1
 	google.golang.org/protobuf v1.36.9
 	gopkg.in/yaml.v2 v2.4.0
+	gopkg.in/yaml.v3 v3.0.1
 	k8s.io/api v0.32.10
 	k8s.io/apimachinery v0.32.10
 	k8s.io/client-go v0.32.10
@@ -272,7 +273,6 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/warnings.v0 v0.1.2 // indirect
-	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
 	k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect

magefiles/packagecloud/releases.go

@@ -77,25 +77,25 @@ var (
 		"debian":    "bullseye",
 		"ubuntu":    "xenial",
 		"raspbian":  "bullseye",
-		"linuxmint": "ulyana",
-		"fedora":    "40",
-		"ol":        "6",
+		"linuxmint": "vanessa",
+		"fedora":    "42",
+		"ol":        "7",
 		"el":        "7",
 		"amazon":    "2",
 		"sles":      "12.5",
-		"opensuse":  "15.0",
+		"opensuse":  "15.6",
 	}
 
 	skipReleases = map[string][]string{
 		"debian":    {},
-		"ubuntu":    {"hirsute", "groovy", "eoan", "disco", "cosmic", "artful", "zesty", "yakkety", "impish", "kinetic", "lunar", "mantic"},
+		"ubuntu":    {"hirsute", "groovy", "eoan", "disco", "cosmic", "artful", "zesty", "yakkety", "impish", "kinetic", "lunar", "mantic", "oracular"},
 		"raspbian":  {},
 		"linuxmint": {},
 		"fedora":    {},
 		"ol":        {},
 		"el":        {},
 		"amazon":    {},
-		"sles":      {"15.0", "15.1"},
+		"sles":      {"15.0", "15.1", "15.2", "15.3"},
 		"opensuse":  {},
 	}
 )

magefiles/pulp.go

@@ -0,0 +1,23 @@
+//go:build mage
+
+package main
+
+import (
+	"fmt"
+	"strings"
+
+	"github.com/magefile/mage/mg"
+	"gitlab.com/gitlab-org/gitlab-runner/magefiles/pulp"
+)
+
+type Pulp mg.Namespace
+
+// SupportedOSVersions prints the list of OS/versions for which runner packages will be released (for the given package type and release branch)
+func (p Pulp) SupportedOSVersions(dist, branch string) error {
+	os, err := pulp.Releases(dist, branch)
+	if err != nil {
+		return err
+	}
+	fmt.Println(strings.Join(os, "\n"))
+	return nil
+}

magefiles/pulp/releases.go

@@ -0,0 +1,143 @@
+package pulp
+
+import (
+	"errors"
+	"fmt"
+	"net/http"
+	"os"
+	"slices"
+	"strings"
+	"time"
+
+	"github.com/samber/lo"
+	"gopkg.in/yaml.v3"
+)
+
+const (
+	pulpReposURL = "https://gitlab.com/api/v4/projects/75880111/repository/files/repos%2Frunner.yaml/raw"
+)
+
+type (
+	pulpRepository struct {
+		Path string `yaml:"path"`
+	}
+
+	pulpRepositories struct {
+		Deb []pulpRepository `yaml:"deb"`
+		Rpm []pulpRepository `yaml:"rpm"`
+	}
+
+	pulpRelease struct {
+		Repositories pulpRepositories `yaml:"repositories"`
+	}
+
+	pulpRepos struct {
+		Stable   pulpRelease `yaml:"gitlab-runner"`
+		Unstable pulpRelease `yaml:"unstable"`
+	}
+
+	pulpConfig struct {
+		Runner pulpRepos `yaml:"runner"`
+	}
+)
+
+var (
+	dists    = []string{"rpm", "deb"}
+	branches = []string{"stable", "unstable"}
+)
+
+func Releases(dist, branch string) ([]string, error) {
+	if !slices.Contains(dists, dist) {
+		return nil, fmt.Errorf("unsupported package type %q", dist)
+	}
+
+	if !slices.Contains(branches, branch) {
+		return nil, fmt.Errorf("unsupported branch %q", branch)
+	}
+
+	tokenType, tokenValue, err := getToken()
+	if err != nil {
+		return nil, err
+	}
+
+	config, err := getPulpRunnerConfig(tokenType, tokenValue)
+	if err != nil {
+		return nil, err
+	}
+
+	return releasesForDistBranch(dist, branch, config), nil
+}
+
+func firstEnv(envs ...string) (string, string, bool) {
+	for _, env := range envs {
+		if val, ok := os.LookupEnv(env); ok {
+			return env, val, true
+		}
+	}
+	return "", "", false
+}
+
+func getToken() (string, string, error) {
+	tokenType, tokenValue, ok := firstEnv("CI_JOB_TOKEN", "PRIVATE_TOKEN")
+	if !ok {
+		return "", "", errors.New("required 'CI_JOB_TOKEN' or 'PRIVATE_TOKEN' variable missing")
+	}
+
+	if tokenValue == "" {
+		return "", "", fmt.Errorf("%s cannot be empty", tokenType)
+	}
+
+	tokenType = strings.ReplaceAll(tokenType, "_", "-")
+
+	return tokenType, tokenValue, nil
+}
+
+func releasesForDistBranch(dist, branch string, config *pulpConfig) []string {
+	var release pulpRelease
+	switch branch {
+	case "stable":
+		release = config.Runner.Stable
+	case "unstable":
+		release = config.Runner.Unstable
+	}
+
+	var repos []pulpRepository
+	switch dist {
+	case "deb":
+		repos = release.Repositories.Deb
+	case "rpm":
+		repos = release.Repositories.Rpm
+	}
+
+	return lo.Map(repos, func(repo pulpRepository, _ int) string {
+		return repo.Path
+	})
+}
+
+// The full Pulp runner repo config file can be enjoyed at
+// https://gitlab.com/gitlab-org/build/pulp-repository-automation/-/blob/main/repos/runner.yaml?ref_type=heads
+func getPulpRunnerConfig(tokenType, tokenValue string) (*pulpConfig, error) {
+	req, err := http.NewRequest("GET", pulpReposURL, nil)
+	if err != nil {
+		return nil, fmt.Errorf("failed to create request for url %q: %w", pulpReposURL, err)
+	}
+	req.Header.Add(tokenType, tokenValue)
+
+	client := http.Client{Timeout: 20 * time.Second}
+	resp, err := client.Do(req)
+	if err != nil {
+		return nil, fmt.Errorf("failed to get url %q: %w", pulpReposURL, err)
+	}
+	defer resp.Body.Close()
+
+	if resp.StatusCode != http.StatusOK {
+		return nil, fmt.Errorf("got unexpected response status code: %s", resp.Status)
+	}
+
+	result := pulpConfig{}
+	if err := yaml.NewDecoder(resp.Body).Decode(&result); err != nil {
+		return nil, fmt.Errorf("failed to decode response body: %w", err)
+	}
+
+	return &result, nil
+}