Badges: have fedbadges build from the right branch and enable github webhook

Signed-off-by: Aurélien Bompard <aurelien@bompard.org>
This commit is contained in:
Aurélien Bompard 2024-04-17 08:51:36 +02:00
parent e32fb64366
commit 8541e8980b
No known key found for this signature in database
GPG key ID: 31584CFEB9BF64AD

View file

@ -39,8 +39,7 @@ spec:
type: Git type: Git
git: git:
uri: https://github.com/fedora-infra/fedbadges.git uri: https://github.com/fedora-infra/fedbadges.git
# ref: {{ (env == 'production')|ternary('stable', 'staging') }} ref: {{ (env == 'production')|ternary('stable', 'staging') }}
ref: develop
contextDir: / contextDir: /
strategy: strategy:
type: Source type: Source
@ -55,14 +54,12 @@ spec:
triggers: triggers:
- type: ConfigChange - type: ConfigChange
- type: ImageChange - type: ImageChange
{#
- type: GitHub - type: GitHub
github: github:
# Not sure why secretReference does not work, but it doesn't. # Not sure why secretReference does not work, but it doesn't.
# secretReference: # secretReference:
# name: github-webook # name: github-webook
secret: "{{ badges_stg_github_secret }}" secret: "{{ (env == 'production')|ternary(badges_prod_github_secret, badges_stg_github_secret) }}"
#}
--- ---
apiVersion: build.openshift.io/v1 apiVersion: build.openshift.io/v1
kind: BuildConfig kind: BuildConfig
@ -77,11 +74,7 @@ spec:
type: Git type: Git
git: git:
uri: https://github.com/fedora-infra/tahrir.git uri: https://github.com/fedora-infra/tahrir.git
{% if env == "staging" %} ref: {{ (env == 'production')|ternary('stable', 'staging') }}
ref: staging
{% else %}
ref: stable
{% endif %}
contextDir: / contextDir: /
strategy: strategy:
type: Source type: Source
@ -96,13 +89,9 @@ spec:
triggers: triggers:
- type: ConfigChange - type: ConfigChange
- type: ImageChange - type: ImageChange
{% if tahrir_stg_github_secret is defined and env == 'staging' %}
- type: GitHub - type: GitHub
github: github:
secret: "{{ tahrir_stg_github_secret }}" # Not sure why secretReference does not work, but it doesn't.
{% endif %} # secretReference:
{% if tahrir_prod_github_secret is defined and env == 'production' %} # name: github-webook
- type: GitHub secret: "{{ (env == 'production')|ternary(badges_prod_github_secret, badges_stg_github_secret) }}"
github:
secret: "{{ tahrir_prod_github_secret }}"
{% endif %}