Skip to content

Commit b3acca9

Browse files
ROX-20234: Add rpms prefetch, set build to hermetic (#2109)
Co-authored-by: Tom Martensen <tmartens@redhat.com>
1 parent 024e279 commit b3acca9

File tree

10 files changed

+13629
-373
lines changed

10 files changed

+13629
-373
lines changed

.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ RELEASED_VERSIONS.unsupported @stackrox/collector-team
1111
# The RHTAP maintainers for ACS review all changes related to the Konflux (f.k.a. RHTAP) pipelines, such as new
1212
# pipelines, parameter changes or automated task updates as well as Dockerfile updates.
1313
**/konflux.*Dockerfile @stackrox/rhtap-maintainers
14-
/.konflux/ @stackrox/rhtap-maintainers
1514
/.tekton/ @stackrox/rhtap-maintainers

.github/renovate.json5

Lines changed: 34 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,18 @@
33

44
// After making changes to this file, you can validate it by running something like this in the root of the repo:
55
// $ docker run --rm -it --entrypoint=renovate-config-validator -v "$(pwd)":/mnt -w /mnt renovate/renovate --strict
6+
// Note: ignore errors about the config for `rpm`. This is to be addressed with https://issues.redhat.com/browse/CWFHEALTH-4117
67
// There are more validation options, see https://docs.renovatebot.com/config-validation/
78

89
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
910
"extends": [
10-
// This inherits the base Konflux config.
11-
// Clickable link https://github.com/konflux-ci/mintmaker/blob/main/config/renovate/renovate.json
12-
// The following was used as example (we may want to check it if the base config gets suddenly moved):
11+
// Note that the base Konflux's MintMaker config gets inherited/included automatically per
12+
// https://redhat-internal.slack.com/archives/C04PZ7H0VA8/p1745492139282819?thread_ts=1745309786.090319&cid=C04PZ7H0VA8
13+
// The config is: https://github.com/konflux-ci/mintmaker/blob/main/config/renovate/renovate.json
14+
// We found out about it here (we may want to check that location if the base config gets suddenly moved):
1315
// https://github.com/enterprise-contract/ec-cli/blob/407847910ad420850385eea1db78e2a2e49c7e25/renovate.json#L1C1-L7C2
14-
"github>konflux-ci/mintmaker//config/renovate/renovate.json",
15-
// This tells Renovate to combine all updates in one PR so that we have less PRs to deal with.
16+
17+
// This tells Renovate to combine all updates in one PR so that we have fewer PRs to deal with.
1618
"group:all",
1719
],
1820
"timezone": "Etc/UTC",
@@ -27,21 +29,46 @@
2729
"updateNotScheduled": false,
2830
"tekton": {
2931
"schedule": [
30-
// For some reason, Konflux config defines custom schedule on each type of dependency manager and that takes
31-
// precedence over the global/default schedule. We want our own schedule and hence need to make this override.
32+
// Override Konflux custom schedule for this manager to our intended one.
3233
"after 3am and before 7am",
3334
],
35+
"packageRules": [
36+
// Note: the packageRules from the Konflux config (find URL in comments above) get merged with these.
37+
{
38+
"groupName": "StackRox custom Konflux Tasks",
39+
"matchPackageNames": [
40+
"/^quay.io/rhacs-eng/konflux-tasks/",
41+
],
42+
},
43+
],
3444
},
3545
"dockerfile": {
3646
"includePaths": [
3747
// Instruct Renovate not try to update Dockerfiles other than konflux.Dockerfile (or konflux.anything.Dockerfile)
3848
// to have less PR noise.
3949
"**/*konflux*.Dockerfile",
4050
],
51+
"schedule": [
52+
// Override Konflux custom schedule for this manager to our intended one.
53+
"after 3am and before 7am",
54+
],
55+
"postUpgradeTasks": {
56+
"commands": [
57+
// Refresh the rpm lockfile after updating image references in the dockerfile.
58+
"rpm-lockfile-prototype rpms.in.yaml",
59+
],
60+
},
61+
},
62+
"rpm": {
63+
"schedule": [
64+
// Override Konflux custom schedule for this manager to our intended one.
65+
"after 3am and before 7am",
66+
],
4167
},
4268
"enabledManagers": [
4369
// Restrict Renovate focus on Konflux things since we rely on GitHub's dependabot for everything else.
4470
"tekton",
4571
"dockerfile",
72+
"rpm",
4673
],
4774
}

.konflux/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

.konflux/scripts/subscription-manager-bro.sh

Lines changed: 0 additions & 306 deletions
This file was deleted.

0 commit comments

Comments
 (0)