fix: Increase limits again (#1299)

* Fix task exit_code, improve memory and fix deprecated-img * Fix task exit_code, improve memory and fix deprecated-img * Fix task exit_code, improve memory and fix deprecated-img * update task
konflux-ci · Aug 1, 2024 · 7f18569 · 7f18569
1 parent 1d36e70
commit 7f18569
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 8 deletions.
diff --git a/.tekton/konflux-e2e-tests-push.yaml b/.tekton/konflux-e2e-tests-push.yaml
@@ -433,6 +433,9 @@ spec:
         - name: kind
           value: task
         resolver: bundles
+      workspaces:
+      - name: workspace
+        workspace: workspace
     - name: update-build-definitions-repo
       runAfter:
       - build-container
@@ -481,9 +484,6 @@ spec:
         - name: kind
           value: task
         resolver: bundles
-      workspaces:
-      - name: workspace
-        workspace: workspace
     workspaces:
     - name: workspace
     - name: git-auth

diff --git a/default.env b/default.env
@@ -106,4 +106,12 @@ export UPGRADE_FORK_ORGANIZATION=redhat-appstudio-qe
 # By default the e2e-tests installer configures master nodes as schedulable.
 # However this option is not recommended for use in production (https://access.redhat.com/solutions/4564851)
 # Set the following env var's value to "false" if you don't want user workloads being scheduled on master/control plane nodes of your cluster.
-export ENABLE_SCHEDULING_ON_MASTER_NODES=true
+export ENABLE_SCHEDULING_ON_MASTER_NODES=true
+
+# Setting this env to a number of ginkgo processes to run in parallel
+# Required: no
+export GINKGO_PROCS=
+
+# Determine if the e2e tests are running in Konflux CI
+# Required: only if run in konflux ci
+export KONFLUX_CI="false"
diff --git a/integration-tests/pipelines/konflux-e2e-tests-pipeline.yaml b/integration-tests/pipelines/konflux-e2e-tests-pipeline.yaml
@@ -111,9 +111,9 @@
           resolver: git
           params:
             - name: url
-              value: https://github.com/konflux-ci/e2e-tests.git
+              value: https://github.com/flacatus/e2e-tests.git
             - name: revision
-              value: main
+              value: limits
             - name: pathInRepo
               value: integration-tests/tasks/konflux-e2e-tests-task.yaml
         params:

diff --git a/integration-tests/tasks/konflux-e2e-tests-task.yaml b/integration-tests/tasks/konflux-e2e-tests-task.yaml
@@ -39,6 +39,9 @@ spec:
       type: string
       description: "Contain the container name from Konflux Snapshot."
       default: "quay.io/redhat-user-workloads/rhtap-qe-shared-tenant/konflux-e2e/konflux-e2e-tests:latest"
+    - name: ginkgo-procs
+      description: "Number of processes to run in parallel in ginkgo"
+      default: 20
   volumes:
     - name: konflux-secret-volume
       secret:
@@ -103,7 +106,7 @@ spec:
         export DEFAULT_QUAY_ORG DEFAULT_QUAY_ORG_TOKEN GITHUB_USER GITHUB_TOKEN QUAY_TOKEN QUAY_OAUTH_USER QUAY_OAUTH_TOKEN OPENSHIFT_API OPENSHIFT_USERNAME OPENSHIFT_PASSWORD \
             GITHUB_ACCOUNTS_ARRAY PREVIOUS_RATE_REMAINING GITHUB_USERNAME_ARRAY GH_RATE_REMAINING PYXIS_STAGE_KEY PYXIS_STAGE_CERT OFFLINE_TOKEN TOOLCHAIN_API_URL KEYLOAK_URL REL_IMAGE_CONTROLLER_QUAY_ORG REL_IMAGE_CONTROLLER_QUAY_TOKEN BYOC_KUBECONFIG GITHUB_TOKENS_LIST OAUTH_REDIRECT_PROXY_URL \
             QE_SPRAYPROXY_HOST QE_SPRAYPROXY_TOKEN E2E_PAC_GITHUB_APP_ID E2E_PAC_GITHUB_APP_PRIVATE_KEY PAC_GITHUB_APP_WEBHOOK_SECRET SLACK_BOT_TOKEN MULTI_PLATFORM_AWS_ACCESS_KEY MULTI_PLATFORM_AWS_SECRET_ACCESS_KEY MULTI_PLATFORM_AWS_SSH_KEY MULTI_PLATFORM_IBM_API_KEY ENABLE_SCHEDULING_ON_MASTER_NODES \
-            PAC_GITLAB_TOKEN PAC_GITLAB_URL PAC_PROJECT_ID EXODUS_PROD_KEY EXODUS_PROD_CERT CGW_USERNAME CGW_TOKEN ORAS_USERNAME ORAS_PASSWORD
+            PAC_GITLAB_TOKEN PAC_GITLAB_URL PAC_PROJECT_ID EXODUS_PROD_KEY EXODUS_PROD_CERT CGW_USERNAME CGW_TOKEN ORAS_USERNAME ORAS_PASSWORD GINKGO_PROCS
 
         DEFAULT_QUAY_ORG=redhat-appstudio-qe
         DEFAULT_QUAY_ORG_TOKEN=$(cat /usr/local/konflux-ci-secrets/default-quay-org-token)
@@ -144,6 +147,7 @@ spec:
         ORAS_PASSWORD=$(cat /usr/local/konflux-ci-secrets/oras-password)
 
         ENABLE_SCHEDULING_ON_MASTER_NODES=false
+        GINKGO_PROCS=$(params.ginkgo-procs)
 
         # user stored: username:token,username:token
         IFS=',' read -r -a GITHUB_ACCOUNTS_ARRAY <<< "$(cat /usr/local/konflux-ci-secrets/github_accounts)"

diff --git a/magefiles/magefile.go b/magefiles/magefile.go
@@ -1302,12 +1302,17 @@ func CleanWorkload() error {
 
 func runTests(labelsToRun string, junitReportFile string) error {
 	pathToSuite := "./cmd"
+	testProcesses := ""
+	if os.Getenv("GINKGO_PROCS") != "" {
+		testProcesses = fmt.Sprintf("--procs=%s", os.Getenv("GINKGO_PROCS"))
+	}
+
 	if os.Getenv("E2E_BIN_PATH") != "" {
 		pathToSuite = os.Getenv("E2E_BIN_PATH")
 	}
 
 	// added --output-interceptor-mode=none to mitigate RHTAPBUGS-34
-	return sh.RunV("ginkgo", "-p", "--output-interceptor-mode=none", "--timeout=90m", fmt.Sprintf("--output-dir=%s", artifactDir), "--junit-report="+junitReportFile, "--label-filter="+labelsToRun, pathToSuite, "--")
+	return sh.RunV("ginkgo", "-p", testProcesses, "--output-interceptor-mode=none", "--timeout=90m", fmt.Sprintf("--output-dir=%s", artifactDir), "--junit-report="+junitReportFile, "--label-filter="+labelsToRun, pathToSuite, "--")
 }
 
 func CleanupRegisteredPacServers() error {