Skip to content

Commit 711ebe8

Browse files
committed
fix imagepolicy image config testcase
fix failure: https://prow.ci.openshift.org/view/gs/test-platform-results/logs/periodic-ci-openshift-release-main-nightly-5.0-e2e-aws-disruptive-longrunning-techpreview-1of2/2054789876368281600 [sig-imagepolicy][Suite:openshift/disruptive-longrunning][Disruptive][OCPFeatureGate:SigstoreImageVerification][Serial] Should fail clusterimagepolicy signature validation when scope in allowedRegistries list does not skip signature verification Signed-off-by: Qi Wang <qiwan@redhat.com>
1 parent 38c4fba commit 711ebe8

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

test/extended/imagepolicy/imagepolicy.go

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ const (
2626
clusterImagePolicyKind = "ClusterImagePolicy"
2727
imagePolicyKind = "ImagePolicy"
2828
testSignedPolicyScope = "quay.io/openshifttest/busybox-testsigstoresigned@sha256:c5439d7db88ab5423999530349d327b04279ad3161d7596d2126dfb5b02bfd1f"
29+
testSignedPolicyScopeRepo = "quay.io/openshifttest/busybox-testsigstoresigned"
2930
testPKISignedPolicyScope = "quay.io/openshifttest/busybox-testsigstoresignedpki@sha256:c5439d7db88ab5423999530349d327b04279ad3161d7596d2126dfb5b02bfd1f"
3031
registriesWorkerPoolMachineConfig = "99-worker-generated-registries"
3132
registriesMasterPoolMachineConfig = "99-master-generated-registries"
@@ -95,8 +96,8 @@ var _ = g.Describe("[sig-imagepolicy][Suite:openshift/disruptive-longrunning][Di
9596
})
9697

9798
g.It("Should fail clusterimagepolicy signature validation when scope in allowedRegistries list does not skip signature verification", func() {
98-
// Ensure allowedRegistries do not skip signature verification by adding testSignedPolicyScope to the list.
99-
allowedRegistries := []string{"quay.io", "registry.redhat.io", "image-registry.openshift-image-registry.svc:5000", testSignedPolicyScope}
99+
// Ensure allowedRegistries do not skip signature verification by adding testSignedPolicyScopeRepo to the list.
100+
allowedRegistries := []string{"quay.io", "registry.redhat.io", "image-registry.openshift-image-registry.svc:5000", testSignedPolicyScopeRepo}
100101
updateImageConfig(oc, allowedRegistries)
101102
g.DeferCleanup(cleanupImageConfig, oc)
102103

@@ -702,6 +703,9 @@ func WaitForMCPConfigSpecChangeAndUpdated(oc *exutil.CLI, pool string, initialSp
702703
if mcp.Status.Configuration.Name == initialSpecName {
703704
return false
704705
}
706+
if mcp.Spec.Configuration.Name != mcp.Status.Configuration.Name {
707+
return false
708+
}
705709
return machineconfighelper.IsMachineConfigPoolConditionTrue(mcp.Status.Conditions, mcfgv1.MachineConfigPoolUpdated)
706710
}, 20*time.Minute, 10*time.Second).Should(o.BeTrue())
707711
}

0 commit comments

Comments
 (0)