From fcfde39d4975c97d20b269539a6d1fd2f906568f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?=
 <91831478+lemeurherve@users.noreply.github.com>
Date: Wed, 1 Nov 2023 11:19:17 +0100
Subject: [PATCH 1/2] fix(httpd): don't include sha256 in `image.tag` value
 (#915)

* fix(httpd): don't include sha256 in `image.tag` value

* bump chart version
---
 charts/httpd/Chart.yaml          |  2 +-
 charts/httpd/values.yaml         |  2 +-
 updatecli/updatecli.d/httpd.yaml | 23 +++++++++++++++--------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/charts/httpd/Chart.yaml b/charts/httpd/Chart.yaml
index 5816bb3a2..cd516899b 100644
--- a/charts/httpd/Chart.yaml
+++ b/charts/httpd/Chart.yaml
@@ -1,7 +1,7 @@
 apiVersion: v1
 description: httpd helm chart for Kubernetes
 name: httpd
-version: 0.2.3
+version: 0.2.4
 appVersion: v2.4
 maintainers:
 - email: jenkins-infra-team@googlegroups.com
diff --git a/charts/httpd/values.yaml b/charts/httpd/values.yaml
index d221e89ec..2011a9946 100644
--- a/charts/httpd/values.yaml
+++ b/charts/httpd/values.yaml
@@ -4,7 +4,7 @@
 replicaCount: 1
 image:
   repository: httpd
-  tag: 2.4@sha256:2f1ec45327a35711f293cf543c2e0efadfd44bc71e8081dcd76a558b99778005
+  tag: 2.4.58
   pullPolicy: IfNotPresent
 imagePullSecrets: []
 nameOverride: ""
diff --git a/updatecli/updatecli.d/httpd.yaml b/updatecli/updatecli.d/httpd.yaml
index f4e31e5fe..a4f8ea9b8 100644
--- a/updatecli/updatecli.d/httpd.yaml
+++ b/updatecli/updatecli.d/httpd.yaml
@@ -13,23 +13,30 @@ scms:
       branch: "{{ .github.branch }}"
 
 sources:
-  latestHttpdRelease:
-    name: Get latest digest of the Docker Image for httpd, in version 2.4
-    kind: dockerdigest
+  latestRelease:
+    kind: githubrelease
+    name: "Get latest apache/httpd release"
+    spec:
+      owner: "apache"
+      repository: "httpd"
+      token: "{{ requiredEnv .github.token }}"
+      username: "{{ .github.username }}"
+
+conditions:
+  checkDockerImagePublished:
+    name: "Test httpd:<latest_version> docker image tag"
+    kind: dockerimage
     spec:
       image: "httpd"
-      tag: "2.4"
       ## Tag from source
       architectures:
         - amd64
         - arm64
 
-# no condition to test httpd docker image availability as we're using a digest from docker hub
-
 targets:
   updateHttpd:
     name: "Update httpd docker image version"
-    sourceid: latestHttpdRelease
+    sourceid: latestRelease
     kind: helmchart
     spec:
       name: charts/httpd
@@ -41,7 +48,7 @@ actions:
   default:
     kind: github/pullrequest
     scmid: default
-    title: Bump `httpd` docker images and helm chart versions
+    title: Bump `httpd` docker image version to {{ source "latestRelease" }}
     spec:
       labels:
         - dependencies

From 76f2180f5866ba4e03fda6111d1b9d706426288e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?=
 <91831478+lemeurherve@users.noreply.github.com>
Date: Wed, 1 Nov 2023 11:23:07 +0100
Subject: [PATCH 2/2] chore(GHA): remove `on.*.papths` from required workflows
 (#911)

---
 .github/workflows/check-chart-versions-bump.yml | 2 --
 .github/workflows/test.yml                      | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/.github/workflows/check-chart-versions-bump.yml b/.github/workflows/check-chart-versions-bump.yml
index 5e05056c9..0f6001b7e 100644
--- a/.github/workflows/check-chart-versions-bump.yml
+++ b/.github/workflows/check-chart-versions-bump.yml
@@ -1,8 +1,6 @@
 name: Check chart version bump
 on:
   pull_request:
-    paths:
-      - 'charts/**'
 jobs:
   check_version_bump_on_modified_charts:
     runs-on: ubuntu-latest
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 674843dcb..0060bc5ea 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -3,11 +3,7 @@ on:
   push:
     branches:
       - main
-    paths:
-      - 'charts/**'
   pull_request:
-    paths:
-      - 'charts/**'
   workflow_dispatch:
 env:
   UNITTEST_VERSION: v0.3.5