Merge branch 'main' into prow-jobs-for-provider-multi-arch-images

Signed-off-by: chandramerla <[email protected]>

docs/how-to-add-a-prow-cluster.md

@@ -60,7 +60,7 @@ type: kubernetes.io/service-account-token
 EOF
 # export secret token data to add to user later on
 kubectl get secret prow-workloads-cluster-automation \
-    -n "default" -o yaml | \
+    -n "kubevirt-prow-jobs" -o yaml | \
     yq -r '.data.token' | \
     base64 -d
 ```

external-plugins/botreview/Makefile

@@ -17,4 +17,4 @@ test:
 
 push:
 	podman build -f ../../images/$(CONTAINER_IMAGE)/Containerfile -t $(CONTAINER_REPO):$(CONTAINER_TAG) && podman push $(CONTAINER_REPO):$(CONTAINER_TAG)
-	bash -x ../../hack/update-deployments-with-latest-image.sh $(CONTAINER_REPO)
+	bash -x ../../hack/update-deployments-with-latest-image.sh $(CONTAINER_REPO) $(CONTAINER_TAG)

external-plugins/referee/Makefile

@@ -16,4 +16,4 @@ format:
 
 push:
 	podman build -f ../../images/$(CONTAINER_IMAGE)/Containerfile -t $(CONTAINER_REPO):$(CONTAINER_TAG) && podman push $(CONTAINER_REPO):$(CONTAINER_TAG)
-	bash -x ../../hack/update-deployments-with-latest-image.sh $(CONTAINER_REPO)
+	bash -x ../../hack/update-deployments-with-latest-image.sh $(CONTAINER_REPO) $(CONTAINER_TAG)

external-plugins/referee/server/server.go

@@ -149,31 +149,39 @@ func (s *Server) handlePREvent(pr github.PullRequestEvent) error {
 	log := s.Log.WithField("pull_request_url", pullRequestURL)
 
 	switch action {
-	case github.PullRequestActionOpened:
-	case github.PullRequestActionReopened:
-	case github.PullRequestActionSynchronize:
-		// update metrics for PRs
-		prTimeLineForLastCommit, err := s.GHGraphQLClient.FetchPRTimeLineForLastCommit(org, repo, num)
-		if err != nil {
-			return fmt.Errorf("%s - failed to fetch number of retest comments: %w", pullRequestURL, err)
-		}
-		switch prTimeLineForLastCommit.NumberOfRetestComments {
-		case 0:
-			metrics.DeleteForPullRequest(org, repo, num)
-			break
-		default:
-			metrics.SetForPullRequest(org, repo, num, prTimeLineForLastCommit.NumberOfRetestComments)
-		}
-		log.Infof("updated metrics on PR")
-		break
+	case github.PullRequestActionConvertedToDraft:
+		// PRs that have been converted to draft are not tested thus they are not of interest for metrics
+		metrics.DeleteForPullRequest(org, repo, num)
+		return nil
 	case github.PullRequestActionClosed:
 		// PRs that have been merged or closed are not of interest for metrics
 		metrics.DeleteForPullRequest(org, repo, num)
-		break
+		return nil
+	case github.PullRequestActionOpened:
+	case github.PullRequestActionReopened:
+	case github.PullRequestActionReadyForReview:
+	case github.PullRequestActionSynchronize:
+		// the above cases are the ones where we need to update the metrics
 	default:
+		// all other cases -> no metric action necessary
 		log.Infof("skipping pull_request event action %s", action)
 		return nil
 	}
+	return updateMetricsForPRs(s, org, repo, num, pullRequestURL, log)
+}
+
+func updateMetricsForPRs(s *Server, org string, repo string, num int, pullRequestURL string, log *logrus.Entry) error {
+	prTimeLineForLastCommit, err := s.GHGraphQLClient.FetchPRTimeLineForLastCommit(org, repo, num)
+	if err != nil {
+		return fmt.Errorf("%s - failed to fetch number of retest comments: %w", pullRequestURL, err)
+	}
+	switch prTimeLineForLastCommit.NumberOfRetestComments {
+	case 0:
+		metrics.DeleteForPullRequest(org, repo, num)
+	default:
+		metrics.SetForPullRequest(org, repo, num, prTimeLineForLastCommit.NumberOfRetestComments)
+	}
+	log.Infof("updated metrics on PR")
 	return nil
 }
 
@@ -182,15 +190,15 @@ func (s *Server) handlePullRequestComment(ic github.IssueCommentEvent) error {
 	repo := ic.Repo.Name
 	num := ic.Issue.Number
 	action := ic.Action
-	user := ic.Comment.User.Login
+	commentAuthor := ic.Comment.User.Login
 
 	pullRequestURL := fmt.Sprintf("https://github.com/%s/%s/pull/%d", org, repo, num)
 	log := s.Log.WithField("pull_request_url", pullRequestURL)
 
 	switch action {
 	case github.IssueCommentActionCreated:
 	default:
-		log.Debugf("skipping for action %s by %s", action, user)
+		log.Debugf("skipping for action %s by %s", action, commentAuthor)
 		return nil
 	}
 
@@ -248,9 +256,10 @@ func (s *Server) handlePullRequestComment(ic github.IssueCommentEvent) error {
 	}
 
 	if !s.DryRun {
+		prAuthor := ic.Issue.User.Login
 		var output bytes.Buffer
 		err := tooManyRetestsCommentTemplate.Execute(&output, TooManyRequestsData{
-			Author: user,
+			Author: prAuthor,
 			Team:   s.Team,
 		})
 		if err != nil {

github/ci/prow-deploy/files/jobs/k8snetworkplumbingwg/kubemacpool/kubemacpool-postsubmits.yaml

@@ -14,7 +14,7 @@ postsubmits:
       cluster: kubevirt-prow-workloads
       spec:
         containers:
-          - image: quay.io/kubevirtci/bootstrap:v20240711-f55d15c
+          - image: quay.io/kubevirtci/bootstrap:v20240814-9b6c4af
             command:
               - "/usr/local/bin/runner.sh"
               - "/bin/bash"
@@ -37,15 +37,15 @@ postsubmits:
       cluster: kubevirt-prow-workloads
       spec:
         containers:
-          - image: quay.io/kubevirtci/bootstrap:v20240711-f55d15c
+          - image: quay.io/kubevirtci/bootstrap:v20240814-9b6c4af
             command:
               - "/usr/local/bin/runner.sh"
               - "/bin/bash"
               - "-c"
               - |
                 cat $QUAY_PASSWORD | docker login --username $(cat $QUAY_USER) --password-stdin=true quay.io &&
                 # Only push images on tags
-                COMMIT_TAG=$(git tag --points-at HEAD | head -1)
+                COMMIT_TAG=$(git tag --points-at HEAD | tail -1)
                 [ -z "$COMMIT_TAG" ] ||
                 make container docker-push IMAGE_TAG=$COMMIT_TAG
             # docker-in-docker needs privileged mode

github/ci/prow-deploy/files/jobs/k8snetworkplumbingwg/kubemacpool/kubemacpool-presubmits-v0.44.yaml

@@ -0,0 +1,62 @@
+---
+presubmits:
+  k8snetworkplumbingwg/kubemacpool:
+    - name: pull-kubemacpool-unit-test-v0.44
+      context: pull-kubemacpool-unit-test
+      branches:
+        - release-0.44
+      always_run: true
+      optional: false
+      decorate: true
+      decoration_config:
+        timeout: 3h
+        grace_period: 5m
+      cluster: kubevirt-prow-control-plane
+      max_concurrency: 6
+      labels:
+        preset-podman-in-container-enabled: "true"
+        preset-docker-mirror-proxy: "true"
+        preset-shared-images: "true"
+      spec:
+        containers:
+          - image: quay.io/kubevirtci/bootstrap:v20230801-94954c0
+            securityContext:
+              privileged: true
+            command:
+              - "/usr/local/bin/runner.sh"
+              - "/bin/sh"
+              - "-c"
+              - "automation/check-patch.unit-test.sh"
+
+    - name: pull-kubemacpool-e2e-k8s-v0.44
+      context: pull-kubemacpool-e2e-k8s
+      branches:
+        - release-0.44
+      always_run: true
+      optional: false
+      decorate: true
+      cluster: kubevirt-prow-workloads
+      decoration_config:
+        timeout: 3h
+        grace_period: 5m
+      max_concurrency: 6
+      labels:
+        preset-podman-in-container-enabled: "true"
+        preset-docker-mirror-proxy: "true"
+        preset-shared-images: "true"
+      spec:
+        nodeSelector:
+          type: bare-metal-external
+        containers:
+          - image: quay.io/kubevirtci/bootstrap:v20230801-94954c0
+            securityContext:
+              privileged: true
+            resources:
+              requests:
+                memory: "29Gi"
+            command:
+              - "/usr/local/bin/runner.sh"
+              - "/bin/sh"
+              - "-c"
+              - "automation/check-patch.e2e-k8s.sh"
+

github/ci/prow-deploy/files/jobs/k8snetworkplumbingwg/kubemacpool/kubemacpool-presubmits.yaml

@@ -21,7 +21,7 @@ presubmits:
         preset-shared-images: "true"
       spec:
         containers:
-          - image: quay.io/kubevirtci/bootstrap:v20240711-f55d15c
+          - image: quay.io/kubevirtci/bootstrap:v20240814-9b6c4af
             securityContext:
               privileged: true
             command:
@@ -52,7 +52,7 @@ presubmits:
         nodeSelector:
           type: bare-metal-external
         containers:
-          - image: quay.io/kubevirtci/bootstrap:v20240711-f55d15c
+          - image: quay.io/kubevirtci/bootstrap:v20240814-9b6c4af
             securityContext:
               privileged: true
             resources:

github/ci/prow-deploy/files/jobs/k8snetworkplumbingwg/ovs-cni/ovs-cni-presubmits.yaml

@@ -23,7 +23,7 @@ presubmits:
         nodeSelector:
           type: bare-metal-external
         containers:
-          - image: quay.io/kubevirtci/bootstrap:v20240711-f55d15c
+          - image: quay.io/kubevirtci/bootstrap:v20240814-9b6c4af
             securityContext:
               privileged: true
             resources:

github/ci/prow-deploy/files/jobs/kubernetes-sigs/cluster-api-provider-kubevirt/cluster-api-provider-kubevirt-presubmits.yaml

@@ -22,7 +22,7 @@ presubmits:
         - /bin/sh
         - -c
         - make functest
-        image: quay.io/kubevirtci/golang:v20240711-f55d15c
+        image: quay.io/kubevirtci/golang:v20240814-9b6c4af
         name: ""
         resources:
           requests:

github/ci/prow-deploy/files/jobs/kubevirt/application-aware-quota/application-aware-quota-postsubmits.yaml

@@ -19,7 +19,7 @@ postsubmits:
       preset-kubevirtci-quay-credential: "true"
     spec:
       containers:
-      - image: quay.io/kubevirtci/bootstrap:v20240711-f55d15c
+      - image: quay.io/kubevirtci/bootstrap:v20240814-9b6c4af
         env:
         - name: DOCKER_PREFIX
           value: quay.io/kubevirt
@@ -56,7 +56,7 @@ postsubmits:
       preset-kubevirtci-quay-credential: "true"
     spec:
       containers:
-      - image: quay.io/kubevirtci/bootstrap:v20240711-f55d15c
+      - image: quay.io/kubevirtci/bootstrap:v20240814-9b6c4af
         env:
         - name: DOCKER_PREFIX
           value: quay.io/kubevirt
@@ -92,7 +92,7 @@ postsubmits:
       preset-github-credentials: "true"
     spec:
       containers:
-      - image: quay.io/kubevirtci/bootstrap:v20240711-f55d15c
+      - image: quay.io/kubevirtci/bootstrap:v20240814-9b6c4af
         env:
         - name: DOCKER_PREFIX
           value: quay.io/kubevirt
@@ -131,7 +131,7 @@ postsubmits:
       preset-github-credentials: "true"
     spec:
       containers:
-      - image: quay.io/kubevirtci/bootstrap:v20240711-f55d15c
+      - image: quay.io/kubevirtci/bootstrap:v20240814-9b6c4af
         env:
         - name: DOCKER_PREFIX
           value: quay.io/kubevirt
@@ -173,7 +173,7 @@ postsubmits:
       preset-kubevirtci-quay-credential: "true"
     spec:
       containers:
-      - image: quay.io/kubevirtci/bootstrap:v20240711-f55d15c
+      - image: quay.io/kubevirtci/bootstrap:v20240814-9b6c4af
         env:
         - name: DOCKER_PREFIX
           value: quay.io/kubevirt

github/ci/prow-deploy/files/jobs/kubevirt/application-aware-quota/application-aware-quota-presubmits.yaml

@@ -17,7 +17,7 @@ presubmits:
       preset-docker-mirror-proxy: "true"
     spec:
       containers:
-        - image: quay.io/kubevirtci/bootstrap:v20240711-f55d15c
+        - image: quay.io/kubevirtci/bootstrap:v20240814-9b6c4af
           command:
             - "/usr/local/bin/runner.sh"
             - "/bin/sh"
@@ -47,7 +47,7 @@ presubmits:
       preset-bazel-cache: "true"
     spec:
       containers:
-        - image: quay.io/kubevirtci/bootstrap:v20240711-f55d15c
+        - image: quay.io/kubevirtci/bootstrap:v20240814-9b6c4af
           command:
             - "/usr/local/bin/runner.sh"
             - "/bin/sh"
@@ -80,7 +80,7 @@ presubmits:
       nodeSelector:
         type: bare-metal-external
       containers:
-        - image: quay.io/kubevirtci/bootstrap:v20240711-f55d15c
+        - image: quay.io/kubevirtci/bootstrap:v20240814-9b6c4af
           command:
             - "/usr/local/bin/runner.sh"
             - "/bin/sh"

github/ci/prow-deploy/files/jobs/kubevirt/bridge-marker/bridge-marker-postsubmits.yaml

@@ -14,7 +14,7 @@ postsubmits:
       cluster: kubevirt-prow-workloads
       spec:
         containers:
-          - image: quay.io/kubevirtci/bootstrap:v20240711-f55d15c
+          - image: quay.io/kubevirtci/bootstrap:v20240814-9b6c4af
             command:
               - "/usr/local/bin/runner.sh"
               - "/bin/bash"
@@ -37,7 +37,7 @@ postsubmits:
       cluster: kubevirt-prow-workloads
       spec:
         containers:
-          - image: quay.io/kubevirtci/bootstrap:v20240711-f55d15c
+          - image: quay.io/kubevirtci/bootstrap:v20240814-9b6c4af
             command:
               - "/usr/local/bin/runner.sh"
               - "/bin/bash"

github/ci/prow-deploy/files/jobs/kubevirt/bridge-marker/bridge-marker-presubmits.yaml

@@ -22,7 +22,7 @@ presubmits:
         nodeSelector:
           type: bare-metal-external
         containers:
-          - image: quay.io/kubevirtci/bootstrap:v20240711-f55d15c
+          - image: quay.io/kubevirtci/bootstrap:v20240814-9b6c4af
             securityContext:
               privileged: true
             resources:

github/ci/prow-deploy/files/jobs/kubevirt/cloud-provider-kubevirt/cloud-provider-kubevirt-presubmits.yaml

@@ -23,7 +23,7 @@ presubmits:
       nodeSelector:
         type: bare-metal-external
       containers:
-        - image: quay.io/kubevirtci/golang:v20240711-f55d15c
+        - image: quay.io/kubevirtci/golang:v20240814-9b6c4af
           command:
             - "/usr/local/bin/runner.sh"
             - "/bin/sh"
@@ -61,7 +61,7 @@ presubmits:
       nodeSelector:
         type: bare-metal-external
       containers:
-        - image: quay.io/kubevirtci/golang:v20240711-f55d15c
+        - image: quay.io/kubevirtci/golang:v20240814-9b6c4af
           command:
             - "/usr/local/bin/runner.sh"
             - "/bin/sh"
@@ -97,7 +97,7 @@ presubmits:
         - /bin/sh
         - -c
         - make functest
-        image: quay.io/kubevirtci/golang:v20240711-f55d15c
+        image: quay.io/kubevirtci/golang:v20240814-9b6c4af
         name: ""
         resources:
           requests:

github/ci/prow-deploy/files/jobs/kubevirt/cluster-network-addons-operator/cluster-network-addons-operator-postsubmits.yaml

@@ -17,7 +17,7 @@ postsubmits:
       cluster: kubevirt-prow-control-plane
       spec:
         containers:
-          - image: quay.io/kubevirtci/bootstrap:v20240711-f55d15c
+          - image: quay.io/kubevirtci/bootstrap:v20240814-9b6c4af
             command:
               - "/usr/local/bin/runner.sh"
               - "/bin/bash"