Update artifacts bucket for packages prow jobs (#432)

* Update artifacts bucket for packages prow jobs * Update ECR registry for additional image cache repos env variables in the packages prow jobs * Address comments
aws · Nov 5, 2024 · 34df51b · 34df51b
1 parent 0461a1c
commit 34df51b
Show file tree

Hide file tree

Showing 30 changed files with 79 additions and 55 deletions.
diff --git a/jobs/aws/eks-anywhere-build-tooling/autoscaler-1-27-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/autoscaler-1-27-presubmits.yaml
@@ -65,7 +65,7 @@ presubmits:
         - name: PRUNE_BUILDCTL
           value: "true"
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/autoscaler-1-28-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/autoscaler-1-28-presubmits.yaml
@@ -65,7 +65,7 @@ presubmits:
         - name: PRUNE_BUILDCTL
           value: "true"
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/autoscaler-1-29-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/autoscaler-1-29-presubmits.yaml
@@ -65,7 +65,7 @@ presubmits:
         - name: PRUNE_BUILDCTL
           value: "true"
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/autoscaler-1-30-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/autoscaler-1-30-presubmits.yaml
@@ -65,7 +65,7 @@ presubmits:
         - name: PRUNE_BUILDCTL
           value: "true"
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/autoscaler-1-31-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/autoscaler-1-31-presubmits.yaml
@@ -65,7 +65,7 @@ presubmits:
         - name: PRUNE_BUILDCTL
           value: "true"
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/aws-otel-collector-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/aws-otel-collector-presubmits.yaml
@@ -61,7 +61,7 @@ presubmits:
               name: public-access-github-token
               key: token
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/cloud-provider-aws-1-27-presubmit.yaml b/jobs/aws/eks-anywhere-build-tooling/cloud-provider-aws-1-27-presubmit.yaml
@@ -63,7 +63,7 @@ presubmits:
         - name: RELEASE_BRANCH
           value: "1-27"
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/cloud-provider-aws-1-28-presubmit.yaml b/jobs/aws/eks-anywhere-build-tooling/cloud-provider-aws-1-28-presubmit.yaml
@@ -63,7 +63,7 @@ presubmits:
         - name: RELEASE_BRANCH
           value: "1-28"
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/cloud-provider-aws-1-29-presubmit.yaml b/jobs/aws/eks-anywhere-build-tooling/cloud-provider-aws-1-29-presubmit.yaml
@@ -63,7 +63,7 @@ presubmits:
         - name: RELEASE_BRANCH
           value: "1-29"
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/cloud-provider-aws-1-30-presubmit.yaml b/jobs/aws/eks-anywhere-build-tooling/cloud-provider-aws-1-30-presubmit.yaml
@@ -63,7 +63,7 @@ presubmits:
         - name: RELEASE_BRANCH
           value: "1-30"
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/cloud-provider-aws-1-31-presubmit.yaml b/jobs/aws/eks-anywhere-build-tooling/cloud-provider-aws-1-31-presubmit.yaml
@@ -63,7 +63,7 @@ presubmits:
         - name: RELEASE_BRANCH
           value: "1-31"
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/distribution-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/distribution-presubmits.yaml
@@ -61,7 +61,7 @@ presubmits:
               name: public-access-github-token
               key: token
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "8Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/eks-anywhere-packages-image-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/eks-anywhere-packages-image-presubmits.yaml
@@ -59,9 +59,9 @@ presubmits:
               name: public-access-github-token
               key: token
         - name: ARTIFACTS_BUCKET
-          value: "s3://projectbuildpipeline-857-pipelineoutputartifactsb-10ajmk30khe3f"
+          value: "s3://codebuildprojectstack-be-pipelineoutputartifactsb-jvwhrzx05xwq"
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/emissary-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/emissary-presubmits.yaml
@@ -65,7 +65,7 @@ presubmits:
         - name: IMAGE_TAG_SUFFIX
           value: "-amd64"
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/harbor-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/harbor-presubmits.yaml
@@ -61,13 +61,13 @@ presubmits:
               name: public-access-github-token
               key: token
         - name: ARTIFACTS_BUCKET
-          value: "s3://projectbuildpipeline-857-pipelineoutputartifactsb-10ajmk30khe3f"
+          value: "s3://codebuildprojectstack-be-pipelineoutputartifactsb-jvwhrzx05xwq"
         - name: PRUNE_BUILDCTL
           value: "true"
         - name: IMAGE_TAG_SUFFIX
           value: "-amd64"
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/harbor-scanner-trivy-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/harbor-scanner-trivy-presubmits.yaml
@@ -61,7 +61,7 @@ presubmits:
               name: public-access-github-token
               key: token
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "8Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/hello-eks-anywhere-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/hello-eks-anywhere-presubmits.yaml
@@ -61,7 +61,7 @@ presubmits:
               name: public-access-github-token
               key: token
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "8Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/metallb-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/metallb-presubmits.yaml
@@ -61,7 +61,7 @@ presubmits:
               name: public-access-github-token
               key: token
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "8Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/metrics-server-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/metrics-server-presubmits.yaml
@@ -61,7 +61,7 @@ presubmits:
               name: public-access-github-token
               key: token
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/prometheus-node-exporter-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/prometheus-node-exporter-presubmits.yaml
@@ -61,7 +61,7 @@ presubmits:
               name: public-access-github-token
               key: token
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/prometheus-prometheus-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/prometheus-prometheus-presubmits.yaml
@@ -61,7 +61,7 @@ presubmits:
               name: public-access-github-token
               key: token
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/redis-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/redis-presubmits.yaml
@@ -61,7 +61,7 @@ presubmits:
               name: public-access-github-token
               key: token
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/rolesanywhere-credential-helper-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/rolesanywhere-credential-helper-presubmits.yaml
@@ -59,7 +59,7 @@ presubmits:
               name: public-access-github-token
               key: token
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/jobs/aws/eks-anywhere-build-tooling/trivy-presubmits.yaml b/jobs/aws/eks-anywhere-build-tooling/trivy-presubmits.yaml
@@ -61,7 +61,7 @@ presubmits:
               name: public-access-github-token
               key: token
         - name: ADDITIONAL_IMAGE_CACHE_REPOS
-          value: "857151390494.dkr.ecr.us-west-2.amazonaws.com"
+          value: "067575901363.dkr.ecr.us-west-2.amazonaws.com"
         resources:
           requests:
             memory: "16Gi"

diff --git a/scripts/lint_prowjobs/main.go b/scripts/lint_prowjobs/main.go
@@ -18,7 +18,6 @@ package main
 
 import (
 	"fmt"
-	"io/ioutil"
 	"log"
 	"os"
 	"os/exec"
@@ -30,6 +29,8 @@ import (
 	core "k8s.io/api/core/v1"
 	"k8s.io/test-infra/prow/config"
 	yaml "sigs.k8s.io/yaml"
+
+	"github.com/aws/eks-anywhere-prow-jobs/templater/jobs"
 )
 
 const (
@@ -82,6 +83,9 @@ func EnvVarsCheck(jc *JobConstants) presubmitCheck {
 			for _, env := range container.Env {
 				if index, exists := jc.envVarExist(env.Name); exists {
 					// check deepequal in case we decide to support EnvVarSource values in the future
+					if jobs.IsCuratedPackagesPresubmit(presubmitConfig.JobBase.Name) {
+						jc.EnvVars[index].Value = "s3://codebuildprojectstack-be-pipelineoutputartifactsb-jvwhrzx05xwq"
+					}
 					if env != jc.EnvVars[index] {
 						lineToFind := fmt.Sprintf("name: %s", env.Name)
 						correctiveAction := fmt.Sprintf("Incorrect env var declared for %s in the %s container, update it to %s", env.Name, container.Name, env)
@@ -106,7 +110,7 @@ func AlwaysRunCheck() presubmitCheck {
 func SkipReportCheck() presubmitCheck {
 	return presubmitCheck(func(presubmitConfig config.Presubmit, fileContentsString string) (bool, int, string) {
 		if presubmitConfig.Reporter.SkipReport {
-			return false, findLineNumber(fileContentsString, "skip_report:"), "Please set always_run to false"
+			return false, findLineNumber(fileContentsString, "skip_report:"), "Please set skip_report to false"
 		}
 		return true, 0, ""
 	})
@@ -217,7 +221,7 @@ func unmarshalJobFile(filePath string, jobConfig *config.JobConfig) *Unmarshaled
 }
 
 func unmarshalYamlFile(filePath string, data interface{}) string {
-	fileContents, fileReadError := ioutil.ReadFile(filePath)
+	fileContents, fileReadError := os.ReadFile(filePath)
 
 	if fileReadError != nil {
 		log.Fatalf("Error reading contents of %s: %v", filePath, fileReadError)

diff --git a/templater/jobs/jobs.go b/templater/jobs/jobs.go
@@ -12,24 +12,24 @@ func GetJobList(jobType string) (map[string]map[string]types.JobConfig, error) {
 		repos := []string{"eks-anywhere", "eks-anywhere-build-tooling"}
 		periodicsList, err := GetJobsByType(repos, "periodic")
 		if err != nil {
-			return nil, fmt.Errorf("error getting periodic list:%v", err)
+			return nil, fmt.Errorf("getting periodic list:%v", err)
 		}
 		return periodicsList, nil
 	case "postsubmit":
 		repos := []string{"eks-anywhere"}
 		postsubmitsList, err := GetJobsByType(repos, "postsubmit")
 		if err != nil {
-			return nil, fmt.Errorf("error getting postsubmits list:%v", err)
+			return nil, fmt.Errorf("getting postsubmits list:%v", err)
 		}
 		return postsubmitsList, nil
 	case "presubmit":
 		repos := []string{"eks-anywhere", "eks-anywhere-build-tooling", "eks-anywhere-packages", "eks-anywhere-prow-jobs"}
 		presubmitsList, err := GetJobsByType(repos, "presubmit")
 		if err != nil {
-			return nil, fmt.Errorf("error getting presubmits list:%v", err)
+			return nil, fmt.Errorf("getting presubmits list:%v", err)
 		}
 		return presubmitsList, nil
 	default:
-		return nil, fmt.Errorf("Unsupported job type: %s", jobType)
+		return nil, fmt.Errorf("unsupported job type: %s", jobType)
 	}
 }
diff --git a/...ter/jobs/presubmit/eks-anywhere-build-tooling/eks-anywhere-packages-image-presubmits.yaml b/...ter/jobs/presubmit/eks-anywhere-build-tooling/eks-anywhere-packages-image-presubmits.yaml
@@ -6,7 +6,7 @@ projectPath: projects/aws/eks-anywhere-packages
 imageBuild: true
 envVars:
 - name: ARTIFACTS_BUCKET
-  value: s3://projectbuildpipeline-857-pipelineoutputartifactsb-10ajmk30khe3f
+  value: s3://codebuildprojectstack-be-pipelineoutputartifactsb-jvwhrzx05xwq
 resources:
   requests:
     memory: 16Gi

diff --git a/templater/jobs/presubmit/eks-anywhere-build-tooling/harbor-presubmits.yaml b/templater/jobs/presubmit/eks-anywhere-build-tooling/harbor-presubmits.yaml
@@ -8,7 +8,7 @@ projectPath: projects/goharbor/harbor
 imageBuild: true
 envVars:
 - name: ARTIFACTS_BUCKET
-  value: s3://projectbuildpipeline-857-pipelineoutputartifactsb-10ajmk30khe3f
+  value: s3://codebuildprojectstack-be-pipelineoutputartifactsb-jvwhrzx05xwq
 - name: PRUNE_BUILDCTL
   value: true
 - name: IMAGE_TAG_SUFFIX