Revert "Run e2e tests on label change and introduce auto cancel of pr…

…evious job (#820)"

This reverts commit 0d3dba6.

.github/workflows/pr_checks/ci.yaml

@@ -2,13 +2,9 @@ name: Run CI checks
 
 on:
   pull_request:
-    types: [opened, synchronize, reopened, labeled, unlabeled]
+    types: [opened, edited, synchronize, reopened, labeled, unlabeled]
   workflow_dispatch:
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 jobs:
   ci:
     name: ci

.github/workflows/pr_checks/codeql.yml

@@ -5,14 +5,10 @@ on:
     branches: [ "main", "release-*" ]
   pull_request:
     branches: [ "main" ]
-    types: [opened, synchronize, reopened, labeled, unlabeled]
+    types: [opened, edited, synchronize, reopened, labeled, unlabeled]
   schedule:
     - cron: '45 15 * * *'
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 jobs:
   analyze:
     name: Analyze

.github/workflows/pr_checks/e2e-short.yaml

@@ -2,11 +2,7 @@ name: Run short e2e tests
 
 on:
   pull_request:
-    types: [opened, synchronize, reopened, labeled, unlabeled]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
+    types: [opened, synchronize, reopened]
 
 env:
   MANAGEMENT_CLUSTER_ENVIRONMENT: "isolated-kind"

.github/workflows/pr_checks/golangci-lint.yml

@@ -2,11 +2,7 @@ name: golangci-lint
 
 on:
   pull_request:
-    types: [opened, synchronize, reopened, labeled, unlabeled]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
+    types: [opened, edited, synchronize, reopened, labeled, unlabeled]
 
 # Remove all permissions from GITHUB_TOKEN except metadata.
 permissions: {}

.github/workflows/pr_checks/lint.yaml

@@ -2,11 +2,7 @@ name: Lint
 
 on:
   pull_request:
-    types: [opened, synchronize, reopened, labeled, unlabeled]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
+    types: [opened, edited, synchronize, reopened, labeled, unlabeled]
 
 # Remove all permissions from GITHUB_TOKEN except metadata.
 permissions: {}

.github/workflows/pr_checks/test_chart.yaml

@@ -2,11 +2,7 @@ name: Lint and Test Charts
 
 on:
   pull_request:
-    types: [opened, synchronize, reopened, labeled, unlabeled]
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
+    types: [opened, edited, synchronize, reopened, labeled, unlabeled]
 
 env:
   TAG: v0.0.1

.github/workflows/pr_checks/trivy.yml

@@ -4,15 +4,11 @@ on:
   push:
     branches: [ "main", "release-*" ]
   pull_request:
-    types: [opened, synchronize, reopened, labeled, unlabeled]
+    types: [opened, edited, synchronize, reopened, labeled, unlabeled]
     branches: [ "main" ]
   schedule:
     - cron: '37 1 * * *'
 
-concurrency:
-  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
-  cancel-in-progress: true
-
 permissions:
   contents: read
 

Makefile

@@ -20,18 +20,6 @@ SHELL = /usr/bin/env bash -o pipefail
 #
 # Go.
 #
-ifeq ($(shell go env GOARCH),amd64)
-GO_ARCH = x86_64
-else
-GO_ARCH = arm64
-endif
-
-ifeq ($(shell go env GOOS),linux)
-UPDATECLI_OS = Linux
-else
-UPDATECLI_OS = Darwin
-endif
-
 GO_VERSION ?= 1.22.0
 GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION)
 REPO ?= rancher/turtles
@@ -154,10 +142,6 @@ GINGKO_VER := $(call get_go_version,github.com/onsi/ginkgo/v2)
 GINKGO := $(abspath $(TOOLS_BIN_DIR)/$(GINKGO_BIN)-$(GINGKO_VER))
 GINKGO_PKG := github.com/onsi/ginkgo/v2/ginkgo
 
-UPDATECLI_BIN := updatecli
-UPDATECLI_VER := v0.85.0
-UPDATECLI := $(abspath $(TOOLS_BIN_DIR)/$(UPDATECLI_BIN)-$(UPDATECLI_VER))
-
 HELM_VER := v3.15.3
 HELM_BIN := helm
 HELM := $(TOOLS_BIN_DIR)/$(HELM_BIN)-$(HELM_VER)
@@ -322,10 +306,6 @@ lint: $(GOLANGCI_LINT) ## Lint the codebase
 lint-fix: $(GOLANGCI_LINT) ## Lint the codebase and run auto-fixers if supported by the linter
 	GOLANGCI_LINT_EXTRA_ARGS=--fix $(MAKE) lint
 
-.PHONY: updatecli
-updatecli-apply: $(UPDATECLI)
-	$(UPDATECLI) apply --config ./updatecli/updatecli.d
-
 ## --------------------------------------
 ## Testing
 ## --------------------------------------
@@ -524,12 +504,6 @@ $(SETUP_ENVTEST): # Build setup-envtest from tools folder.
 $(GINKGO): # Build ginkgo from tools folder.
 	GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(GINKGO_PKG) $(GINKGO_BIN) $(GINGKO_VER)
 
-$(UPDATECLI): # Install updatecli
-	curl -sSL -o ${TOOLS_BIN_DIR}/updatecli_${GO_ARCH}.tar.gz https://github.com/updatecli/updatecli/releases/download/${UPDATECLI_VER}/updatecli_${UPDATECLI_OS}_${GO_ARCH}.tar.gz
-	cd ${TOOLS_BIN_DIR} && tar -xzf updatecli_${GO_ARCH}.tar.gz
-	cd ${TOOLS_BIN_DIR} && chmod +x updatecli
-	cd ${TOOLS_BIN_DIR} && mv updatecli $(UPDATECLI_BIN)-$(UPDATECLI_VER)
-
 $(GOLANGCI_LINT): # Download and install golangci-lint
 	hack/ensure-golangci-lint.sh \
 		-b $(TOOLS_BIN_DIR) \

updatecli/updatecli.d/manifest.yaml

@@ -160,8 +160,7 @@ actions:
     kind: github/pullrequest
     scmid: turtles
     spec:
-      automerge: true
+      automerge: false
       mergemethod: squash
       labels:
-        - area/update
-        - kind/chore
+        - capiproviders