Skip to content

Commit

Permalink
tests: Remove use of CentOS 8 from golden image func tests
Browse files Browse the repository at this point in the history
The source of this image stream is also changed to the smaller and more
up to date containerdisks project version of the image.

Signed-off-by: Lee Yarwood <[email protected]>
  • Loading branch information
lyarwood committed Aug 22, 2024
1 parent 3eadcaf commit 8e909d4
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion build/Dockerfile.okd
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ COPY hack/testFiles/test_quickstart.yaml quickStart/
COPY hack/testFiles/test_dashboard_cm.yaml dashboard/
COPY assets/ .
COPY ci-test-files/dataImportCronTemplatesWithImageStream.yaml dataImportCronTemplates/
COPY ci-test-files/centos8-imagestream.yaml imageStreams/
COPY ci-test-files/centos9-stream-imagestream.yaml imageStreams/

ENTRYPOINT /usr/bin/hyperconverged-cluster-operator
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
apiVersion: image.openshift.io/v1
kind: ImageStream
metadata:
name: centos8
name: centos-stream9
namespace: kubevirt-os-images
spec:
lookupPolicy:
Expand All @@ -10,7 +10,7 @@ spec:
- annotations: null
from:
kind: DockerImage
name: quay.io/kubevirt/centos8-container-disk-images
name: quay.io/containerdisks/centos-stream:9
importPolicy:
scheduled: true
importMode: Legacy
Expand Down
6 changes: 3 additions & 3 deletions ci-test-files/dataImportCronTemplatesWithImageStream.yaml
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
- metadata:
name: centos8-image-cron-is
name: centos-stream9-image-cron-is
spec:
schedule: "0 */12 * * *"
template:
spec:
source:
registry:
imageStream: "centos8"
imageStream: "centos-stream9"
pullMethod: node
storage:
resources:
requests:
storage: 10Gi
garbageCollect: Outdated
managedDataSource: centos8-is
managedDataSource: centos-stream9-is
8 changes: 4 additions & 4 deletions tests/func-tests/golden_image_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ const (
)

var (
expectedImages = []string{"centos-stream9-image-cron", "centos8-image-cron-is", "fedora-image-cron"}
expectedImages = []string{"centos-stream9-image-cron", "centos-stream9-image-cron-is", "fedora-image-cron"}
imageNamespace = defaultImageNamespace
expectedImageStreams = []tests.ImageStreamConfig{
{
Name: "centos8",
RegistryName: "quay.io/kubevirt/centos8-container-disk-images",
UsageImages: []string{"centos8-image-cron-is"},
Name: "centos-stream9",
RegistryName: "quay.io/containerdisks/centos-stream:9",
UsageImages: []string{"centos-stream9-image-cron-is"},
},
}
)
Expand Down

0 comments on commit 8e909d4

Please sign in to comment.