Skip to content

Commit 694ced1

Browse files
Vincent056claude
andcommitted
CMP-4648: Fix the content image profile-enable list
Two defects found during joint testing on a mixed-architecture CNV cluster: 1. The cis-vm-extension and cis-vm-extension-node enables sat in the x86_64-only block, so the aarch64 datastream shipped without the profiles - on a mixed-arch worker pool the ARM nodes fail with 'No profile matching suffix' and strictNodeScan turns the whole pool ERROR. Move them to the all-architecture block so aarch64, ppc64le and s390x get them too. 2. de52a3c removed the ocp4 and rhcos4 STIG V2R2 profile snapshots but the enable list still sed'ed them; the failing sed short-circuited the && chain and silently skipped every later enable (stig-v2r3, stig-node-v2r3, the virt profiles and the rhcos4 bsi enables), masked by a trailing ';' that kept the RUN exit 0. Remove the three dead seds; the block is now a single && chain so a future missing file fails the build loudly. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
1 parent 6f70c98 commit 694ced1

1 file changed

Lines changed: 5 additions & 6 deletions

File tree

Dockerfiles/compliance-operator-content-konflux.Containerfile

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ RUN sed -i 's/\(documentation_complete: \).*/\1true/' \
1919
products/ocp4/profiles/cis.profile \
2020
products/ocp4/profiles/cis-node-1-7.profile \
2121
products/ocp4/profiles/cis-1-7.profile \
22+
products/ocp4/profiles/cis-node-1-9.profile \
23+
products/ocp4/profiles/cis-1-9.profile \
2224
products/ocp4/profiles/moderate-node.profile \
2325
products/ocp4/profiles/moderate.profile \
2426
products/ocp4/profiles/moderate-node-rev-4.profile \
@@ -28,7 +30,9 @@ RUN sed -i 's/\(documentation_complete: \).*/\1true/' \
2830
products/ocp4/profiles/pci-dss-node-4-0.profile \
2931
products/ocp4/profiles/pci-dss-4-0.profile \
3032
products/ocp4/profiles/pci-dss-node-3-2.profile \
31-
products/ocp4/profiles/pci-dss-3-2.profile
33+
products/ocp4/profiles/pci-dss-3-2.profile \
34+
products/ocp4/profiles/cis-vm-extension.profile \
35+
products/ocp4/profiles/cis-vm-extension-node.profile
3236

3337
# Enable the FedRAMP Moderate profile on ARM64.
3438
RUN if [ "$(uname -m)" = "aarch64" ]; then \
@@ -59,15 +63,10 @@ RUN if [ "$(uname -m)" = "x86_64" ]; then \
5963
sed -i 's/\(documentation_complete: \).*/\1true/' products/ocp4/profiles/bsi-node.profile && \
6064
sed -i 's/\(documentation_complete: \).*/\1true/' products/ocp4/profiles/bsi-2022.profile && \
6165
sed -i 's/\(documentation_complete: \).*/\1true/' products/ocp4/profiles/bsi-node-2022.profile && \
62-
sed -i 's/\(documentation_complete: \).*/\1true/' products/ocp4/profiles/stig-v2r2.profile && \
6366
sed -i 's/\(documentation_complete: \).*/\1true/' products/ocp4/profiles/stig-v2r3.profile && \
64-
sed -i 's/\(documentation_complete: \).*/\1true/' products/ocp4/profiles/stig-node-v2r2.profile && \
6567
sed -i 's/\(documentation_complete: \).*/\1true/' products/ocp4/profiles/stig-node-v2r3.profile && \
66-
sed -i 's/\(documentation_complete: \).*/\1true/' products/ocp4/profiles/cis-vm-extension.profile && \
67-
sed -i 's/\(documentation_complete: \).*/\1true/' products/ocp4/profiles/cis-vm-extension-node.profile && \
6868
sed -i 's/\(documentation_complete: \).*/\1true/' products/rhcos4/profiles/bsi.profile && \
6969
sed -i 's/\(documentation_complete: \).*/\1true/' products/rhcos4/profiles/bsi-2022.profile && \
70-
sed -i 's/\(documentation_complete: \).*/\1true/' products/rhcos4/profiles/stig-v2r2.profile; \
7170
sed -i 's/\(documentation_complete: \).*/\1true/' products/rhcos4/profiles/stig-v2r3.profile; \
7271
fi
7372

0 commit comments

Comments
 (0)