Merge branch 'main' into dependabot/docker/cmd/image-detector/golang-…

…1.23.6-alpine3.21
kyma-project · Feb 7, 2025 · 8528e38 · 8528e38
2 parents 6b62740 + 84fa6f6
commit 8528e38
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 20 deletions.
diff --git a/cmd/cloud-run/rotate-service-account/Dockerfile b/cmd/cloud-run/rotate-service-account/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.23.5-alpine3.21 as builder
+FROM golang:1.23.6-alpine3.21 as builder
 
 WORKDIR /go/src/github.com/kyma-project/test-infra
 COPY . .

diff --git a/cmd/image-builder/config.go b/cmd/image-builder/config.go
@@ -345,19 +345,9 @@ func loadJenkinsGitState(logger Logger) (GitStateConfig, error) {
 		return GitStateConfig{}, fmt.Errorf("failed to extract owner and repository from git URL %s: %w", gitURL, err)
 	}
 
-	// TODO(kacpermalachowski): For PRs this is a head commit, not a base commit.
-	// There is no reliable way to get the base commit SHA in Jenkins.
-	// See: https://github.tools.sap/kyma/oci-image-builder/issues/165
-	baseCommitSHA, present := os.LookupEnv("GIT_COMMIT")
-	if !present {
-		return GitStateConfig{}, fmt.Errorf("GIT_COMMIT environment variable is not set, please set it to valid commit SHA")
-	}
-
 	gitState := GitStateConfig{
 		RepositoryName:  repo,
 		RepositoryOwner: owner,
-		JobType:         "postsubmit",
-		BaseCommitSHA:   baseCommitSHA,
 	}
 
 	if isPullRequest {
@@ -370,13 +360,37 @@ func loadJenkinsGitState(logger Logger) (GitStateConfig, error) {
 		if !present {
 			return GitStateConfig{}, fmt.Errorf("CHANGE_BRANCH environment variable is not set, please set it to valid base branch name")
 		}
+
+		// In Jenkins, the GIT_COMMIT is head commit SHA for pull request
+		// See: https://github.tools.sap/kyma/oci-image-builder/issues/165
+		headCommitSHA, present := os.LookupEnv("GIT_COMMIT")
+		if !present {
+			return GitStateConfig{}, fmt.Errorf("GIT_COMMIT environment variable is not set, please set it to valid head commit SHA")
+		}
+
+		baseCommitSHA, present := os.LookupEnv("CHANGE_BASE_SHA")
+		if !present {
+			return GitStateConfig{}, fmt.Errorf("CHANGE_BASE_SHA environment variable is not set, please set it to valid base commit SHA")
+		}
+
 		gitState.JobType = "presubmit"
 		gitState.PullRequestNumber = pullNumber
+		gitState.BaseCommitSHA = baseCommitSHA
+		gitState.PullHeadCommitSHA = headCommitSHA
 		gitState.BaseCommitRef = baseRef
-		gitState.PullHeadCommitSHA = baseCommitSHA
 		gitState.isPullRequest = true
+
+		return gitState, nil
 	}
 
+	baseCommitSHA, present := os.LookupEnv("GIT_COMMIT")
+	if !present {
+		return GitStateConfig{}, fmt.Errorf("GIT_COMMIT environment variable is not set, please set it to valid commit SHA")
+	}
+
+	gitState.JobType = "postsubmit"
+	gitState.BaseCommitSHA = baseCommitSHA
+
 	return gitState, nil
 }
 

diff --git a/cmd/image-builder/config_test.go b/cmd/image-builder/config_test.go
@@ -404,17 +404,18 @@ func TestLoadGitStateConfig(t *testing.T) {
 				ciSystem: Jenkins,
 			},
 			env: map[string]string{
-				"CHANGE_BRANCH": "refs/heads/main",
-				"JENKINS_HOME":  "/some/absolute/path",
-				"CHANGE_ID":     "14",
-				"GIT_URL":       "github.com/kyma-project/test-infra.git",
-				"GIT_COMMIT":    "1234",
+				"CHANGE_BRANCH":   "refs/heads/main",
+				"JENKINS_HOME":    "/some/absolute/path",
+				"CHANGE_ID":       "14",
+				"GIT_URL":         "github.com/kyma-project/test-infra.git",
+				"GIT_COMMIT":      "1234",
+				"CHANGE_BASE_SHA": "4321",
 			},
 			gitState: GitStateConfig{
 				RepositoryName:    "test-infra",
 				RepositoryOwner:   "kyma-project",
 				JobType:           "presubmit",
-				BaseCommitSHA:     "1234",
+				BaseCommitSHA:     "4321",
 				BaseCommitRef:     "refs/heads/main",
 				PullRequestNumber: 14,
 				PullHeadCommitSHA: "1234",

diff --git a/configs/terraform/environments/dev/secrets-rotator/terraform.tfvars b/configs/terraform/environments/dev/secrets-rotator/terraform.tfvars
@@ -3,6 +3,6 @@ region                                               = "europe-west3"
 service_account_keys_rotator_service_name            = "service-account-keys-rotator"
 service_account_keys_rotator_image                   = "europe-docker.pkg.dev/kyma-project/prod/test-infra/rotate-service-account:v20250205-5de2e187" #gitleaks:allow
 service_account_keys_cleaner_service_name            = "service-account-keys-cleaner"
-service_account_keys_cleaner_image                   = "europe-docker.pkg.dev/kyma-project/prod/test-infra/service-account-keys-cleaner:v20250205-5de2e187" #gitleaks:allow
+service_account_keys_cleaner_image                   = "europe-docker.pkg.dev/kyma-project/prod/test-infra/service-account-keys-cleaner:v20250207-4a1ca2ad" #gitleaks:allow
 service_account_key_latest_version_min_age           = 24
 service_account_keys_cleaner_scheduler_cron_schedule = "0 0 * * 1-5"
diff --git a/configs/terraform/environments/prod/terraform.tfvars b/configs/terraform/environments/prod/terraform.tfvars
@@ -10,7 +10,7 @@ kyma_project_artifact_registry_collection = {
 service_account_keys_rotator_service_name            = "service-account-keys-rotator"
 service_account_keys_rotator_image                   = "europe-docker.pkg.dev/kyma-project/prod/test-infra/rotate-service-account:v20250205-5de2e187" #gitleaks:allow
 service_account_keys_cleaner_service_name            = "service-account-keys-cleaner"
-service_account_keys_cleaner_image                   = "europe-docker.pkg.dev/kyma-project/prod/test-infra/service-account-keys-cleaner:v20250205-5de2e187" #gitleaks:allow
+service_account_keys_cleaner_image                   = "europe-docker.pkg.dev/kyma-project/prod/test-infra/service-account-keys-cleaner:v20250207-4a1ca2ad" #gitleaks:allow
 service_account_key_latest_version_min_age           = 24
 service_account_keys_cleaner_scheduler_cron_schedule = "0 0 * * 1-5"