From 80e7bd5fff5f17ad3fd2afe700e4e235114c5d67 Mon Sep 17 00:00:00 2001
From: Denis Mironov <dmironov@wallarm.com>
Date: Wed, 4 Dec 2024 12:05:22 +0100
Subject: [PATCH 1/2] Fix chart tests to proper use of user token

---
 .github/workflows/ci.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index b14d50a13..c79cebd33 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -231,6 +231,7 @@ jobs:
           path: kubernetes-ci
           secrets: |
             kv-gitlab-ci/data/github/ingress api_token ;
+            kv-gitlab-ci/data/github/ingress user_token ;
             kv-gitlab-ci/data/github/shared/dockerhub-creds user | DOCKERHUB_USER ;
             kv-gitlab-ci/data/github/shared/dockerhub-creds password | DOCKERHUB_PASSWORD ;
 

From f0e9170dd7fe160bc76899ce490ca5accae16064 Mon Sep 17 00:00:00 2001
From: Aleksandr Orekhov <aorekhov@wallarm.com>
Date: Wed, 4 Dec 2024 12:29:42 +0100
Subject: [PATCH 2/2] Add condition to force testing

---
 .github/workflows/ci.yaml | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index c79cebd33..8c0737fb2 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -5,6 +5,11 @@ on:
     branches: ['main', 'stable/**']
     types: ['opened', 'reopened', 'synchronize']
   workflow_dispatch:
+    inputs:
+      force_build:
+        description: 'Force build job to run'
+        required: false
+        default: 'false'
 
 
 permissions:
@@ -23,6 +28,7 @@ jobs:
       helm: ${{ steps.filter.outputs.helm }}
       smoke: ${{ steps.filter.outputs.smoke }}
       runner: ${{ steps.runner.outputs.type }}
+      force_build: ${{ github.event.inputs.force_build }}
     steps:
 
       - name: Checkout
@@ -48,6 +54,10 @@ jobs:
               - 'charts/ingress-nginx/**/*'
             smoke:
               - 'test/smoke/*'
+      
+      - name: Set force build output
+        if: ${{ github.event_name == 'workflow_dispatch' }}
+        run: echo "force_build=${{ github.event.inputs.force_build }}" >> $GITHUB_OUTPUT
 
 
 
@@ -55,7 +65,7 @@ jobs:
     name: Build images
     runs-on: ${{ matrix.RUNNER }}
     if: |
-      (needs.changes.outputs.base == 'true' || needs.changes.outputs.go == 'true' || needs.changes.outputs.helm == 'true' || needs.changes.outputs.smoke == 'true')
+      (needs.changes.outputs.base == 'true' || needs.changes.outputs.go == 'true' || needs.changes.outputs.helm == 'true' || needs.changes.outputs.smoke == 'true') || needs.changes.outputs.force_build == 'true'
     needs:
       - changes
     strategy:
@@ -122,7 +132,7 @@ jobs:
       - build
       - changes
     if: |
-      (needs.changes.outputs.helm == 'true' || needs.changes.outputs.go == 'true' || needs.changes.outputs.smoke == 'true')
+      (needs.changes.outputs.helm == 'true' || needs.changes.outputs.go == 'true' || needs.changes.outputs.smoke == 'true') || needs.changes.outputs.force_build == 'true'
     strategy:
       fail-fast: false
       matrix:
@@ -212,7 +222,7 @@ jobs:
     needs:
       - build
       - changes
-    if: needs.changes.outputs.helm == 'true'
+    if: needs.changes.outputs.helm == 'true' || needs.changes.outputs.force_build == 'true'
     env:
       ARCH: amd64
     strategy:
@@ -279,7 +289,7 @@ jobs:
     needs:
       - build
       - changes
-    if: needs.changes.outputs.go == 'true'
+    if: needs.changes.outputs.go == 'true' || needs.changes.outputs.force_build == 'true'
     env:
       ARCH: amd64
     steps:
@@ -337,7 +347,7 @@ jobs:
     needs:
       - changes
       - build
-    if: needs.changes.outputs.go == 'true'
+    if: needs.changes.outputs.go == 'true' || needs.changes.outputs.force_build == 'true'
     env:
       ARCH: amd64
     strategy:
@@ -407,7 +417,7 @@ jobs:
       - changes
       - build
     if: |
-      (needs.changes.outputs.base == 'true' || needs.changes.outputs.go == 'true')
+      (needs.changes.outputs.base == 'true' || needs.changes.outputs.go == 'true') || needs.changes.outputs.force_build == 'true'
     env:
       ARCH: amd64
     steps: