bugs

Author: alephnull

Makefile

@@ -10,11 +10,12 @@ REPOS        ?= tyk tyk-analytics tyk-pump tyk-identity-broker tyk-sink portal t
 GITHUB_TOKEN ?= $(shell pass me/github)
 JIRA_USER    ?= [email protected]
 JIRA_TOKEN   ?= $(shell pass Tyk/atlassian)
-VARIATION    ?= prod-variations
+VARIATION    ?= prod-variation
 PC_TOKEN     ?= $(shell pass Tyk/packagecloud)
 
 UNSTABLE_REPOS := tyk-gateway-unstable tyk-dashboard-unstable tyk-pump-unstable tyk-mdcb-unstable portal-unstable tyk-identity-broker-unstable tyk-sync-unstable
 STABLE_REPOS := tyk-gateway tyk-dashboard tyk-pump tyk-mdcb portal tyk-identity-broker
+
 gromit: go.mod go.sum *.go $(SRC) $(TEMPLATES) update-variation
 	go build -v -trimpath -ldflags "-X github.com/TykTechnologies/gromit/util.version=$(VERSION) -X github.com/TykTechnologies/gromit/util.commit=$(COMMIT) -X github.com/TykTechnologies/gromit/util.buildDate=$(BUILD_DATE)"
 	go mod tidy

config/config.yaml

@@ -43,7 +43,7 @@ policy:
       buildenv: 1.23-bullseye
       # baseimage what the container images are based on. It needs to be a
       # debian compatible distro as the Dockerfile assumes apt-get
-      baseimage: debian:bookworm-slim
+      baseimage: debian:trixie-slim
       # distrolessbaseimage is used for container images when the
       # distroless feature is set. base is appropriate for cgo
       # builds, static for pure go.
@@ -172,17 +172,12 @@ policy:
               features:
                 - distroless
                 - release-test
-            release-5.5:
-              buildenv: 1.21-bullseye
-              features:
-                - s390x
-                - release-test
             release-5-lts:
               buildenv: 1.16
               features:
                 - plugin-compiler-fix-vendor
                 - python-support
-            release-5.7:
+            release-5.8:
               builds:
                 ee:
                   flags:
@@ -260,6 +255,26 @@ policy:
                   docker: linux/amd64
               env:
                 - GOEXPERIMENT=boringcrypto
+            ee:
+              flags:
+                - -tags=goplugin,ee
+              description: >-
+                Enterprise Edition Dashboard for the Tyk API Gateway.
+              imagetitle: Tyk Dashboard Enterprise Edition
+              buildpackagename: tyk-dashboard-ee
+              pcrepo: tyk-ee-unstable
+              dhrepo: tykio/tyk-gateway-ee
+              cirepo: tyk-ee
+              archs:
+                - go: amd64
+                  deb: amd64
+                  docker: linux/amd64
+                - go: arm64
+                  deb: aarch64
+                  docker: linux/arm64
+                - go: s390x
+                  deb: s390x
+                  docker: linux/s390x
           branches:
             master:
               cgo: false
@@ -477,7 +492,7 @@ policy:
             main:
 
 # pkgs is used by the pkgs subcommand to weed packagecloud. Unlike the
-# policy, key, you cannot override parameters from other levels.
+# policy key, you cannot override parameters from other levels.
 # Precedence is exceptions > versioncutoff > agecutoff
 
 # Quirks of x/mod/semver:

policy/templates/releng/.github/workflows/release.yml

@@ -11,11 +11,14 @@ name: Release
 # - devenv ECR
 # - Cloudsmith
 
-# concurrency:
-#   group: {{`${{ github.workflow }}-${{ github.ref }}`}}
-#   cancel-in-progress: {{`${{ github.event_name == 'pull_request' }}`}}
+concurrency:
+  group: {{`${{ github.workflow }}-${{ github.ref }}`}}
+  cancel-in-progress: {{`${{ github.event_name == 'pull_request' }}`}}
 
 on: 
+  # Trigger release every monday at midnight for master CI images
+  schedule:
+    - cron: "0 0 * * 1"
   pull_request:
   push:
     branches:

policy/templates/releng/.github/workflows/release.yml.d/smoke-tests.gotmpl

@@ -99,7 +99,7 @@
 
       - name: Test the built container image with api functionality test.
         run: |
-          docker run -d -p8080:8080 --name=test --network {{`${{ job.container.network }}`}} --rm test-{{`${{ matrix.distro }}-${{ matrix.arch }}`}}
+          docker run -d -p8080:8080 --name=test --platform linux/{{`${{ matrix.arch }}`}} --network {{`${{ job.container.network }}`}} --rm test-{{`${{ matrix.distro }}-${{ matrix.arch }}`}}
           sleep 2
           ./ci/tests/api-functionality/api_test.sh
           sleep 2

policy/templates/subtemplates/auto/auto-test.gotmpl

@@ -100,7 +100,7 @@
           {{- if eq .dot.Name "tyk-pro" }}
           tags=($match_tag)
           {{ else }}
-          tags=({{`${{ needs.goreleaser.outputs.tags }}`}})
+          tags=({{`${{ needs.goreleaser.outputs.std_tags }}`}})
           {{ end -}}
           set -eaxo pipefail
           docker run -q --rm -v ~/.docker/config.json:/root/.docker/config.json tykio/gromit policy match ${tags[0]} ${match_tag} 2>versions.env

policy/tfuncs.go

@@ -1,6 +1,10 @@
 package policy
 
-import "reflect"
+import (
+	"reflect"
+
+	"github.com/TykTechnologies/gromit/util"
+)
 
 // Template functions called while rendering
 
@@ -14,7 +18,7 @@ func (rp RepoPolicy) GetCC(target, host string) string {
 
 // getImages returns the list of container manifests
 func (rp RepoPolicy) GetImages(repos ...string) []string {
-	images := make(set[string])
+	images := make(util.Set[string])
 	for _, bv := range rp.Branchvals.Builds {
 		for _, repo := range repos {
 			image := getBuildField(bv, repo)
@@ -28,7 +32,7 @@ func (rp RepoPolicy) GetImages(repos ...string) []string {
 
 // getDockerPlatforms returns the list of docker platforms that are to be supported
 func (rp RepoPolicy) GetDockerPlatforms() []string {
-	platforms := make(set[string])
+	platforms := make(util.Set[string])
 	for _, bv := range rp.Branchvals.Builds {
 		for _, a := range bv.Archs {
 			if len(a.Docker) > 0 {