Skip to content

Commit

Permalink
Merge branch 'w/2.7/improvement/ZENKO-4790' into w/2.8/improvement/ZE…
Browse files Browse the repository at this point in the history
  • Loading branch information
francoisferrand committed Apr 3, 2024
2 parents c44d063 + ab82293 commit e6d6463
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 23 deletions.
13 changes: 3 additions & 10 deletions .github/workflows/alerts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,9 @@ name: Test alerts

on:
push:
branches:
- "documentation/**"
- "feature/**"
- "improvement/**"
- "bugfix/**"
- "w/**"
- "hotfix/**"
- "ci-dev/**"
- "user/**"
- "q/*/**"
branches-ignore:
- 'development/**'
- 'q/*'

jobs:
run-alert-tests:
Expand Down
13 changes: 3 additions & 10 deletions .github/workflows/end2end.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,9 @@ concurrency:

on:
push:
branches:
- "documentation/**"
- "feature/**"
- "improvement/**"
- "bugfix/**"
- "w/**"
- "hotfix/**"
- "ci-dev/**"
- "user/**"
- "q/*/**"
branches-ignore:
- 'development/**'
- 'q/*'

env:
# kind-env
Expand Down
6 changes: 3 additions & 3 deletions solution/deps.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ backbeat:
dashboard: backbeat-dashboards
image: backbeat
policy: backbeat-policies
tag: 8.6.39
tag: 8.6.41
envsubst: BACKBEAT_TAG
busybox:
image: busybox
Expand All @@ -32,7 +32,7 @@ kafka-cleaner:
sourceRegistry: registry.scality.com/kafka-cleaner
dashboard: kafka-cleaner-dashboards
image: kafka-cleaner
tag: v1.0.1
tag: v1.0.2
envsubst: KAFKA_CLEANER_TAG
kafka-connect:
sourceRegistry: registry.scality.com/zenko
Expand Down Expand Up @@ -75,7 +75,7 @@ s3utils:
sourceRegistry: registry.scality.com/s3utils
dashboard: s3utils-dashboards
image: s3utils
tag: 1.14.4
tag: 1.14.5
envsubst: S3UTILS_TAG
sorbet:
sourceRegistry: registry.scality.com/sorbet
Expand Down

0 comments on commit e6d6463

Please sign in to comment.