Skip to content

Switch to S2I container images #522

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kstrenkova wants to merge 1 commit into
base: main
Choose a base branch
from
+16 −16
Open

Switch to S2I container images #522

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions api/v1beta1/common_webhook.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,10 @@ const (
)

const (
DefaultTempestContainerImageURL = "quay.io/podified-antelope-centos9/openstack-tempest-all:current-podified"
DefaultTobikoContainerImageURL = "quay.io/podified-antelope-centos9/openstack-tobiko:current-podified"
DefaultAnsibleTestContainerImageURL = "quay.io/podified-antelope-centos9/openstack-ansible-tests:current-podified"
DefaultHorizonTestContainerImageURL = "quay.io/podified-antelope-centos9/openstack-horizontest:current-podified"
DefaultTempestContainerImageURL = "quay.io/openstack-s2i-containers/openstack-tempest:master-latest"
DefaultTobikoContainerImageURL = "quay.io/openstack-s2i-containers/openstack-tobiko:master-latest"
DefaultAnsibleTestContainerImageURL = "quay.io/openstack-s2i-containers/openstack-ansible-test:master-latest"
DefaultHorizonTestContainerImageURL = "quay.io/openstack-s2i-containers/openstack-horizontest:master-latest"
)

// SetupDefaults - initializes any CRD field defaults based on environment variables (the defaulting mechanism itself is implemented via webhooks)
Expand Down
8 changes: 4 additions & 4 deletions config/default/manager_default_images.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ spec:
- name: manager
env:
- name: RELATED_IMAGE_TEST_TEMPEST_IMAGE_URL_DEFAULT
value: quay.io/podified-antelope-centos9/openstack-tempest-all:current-podified
value: quay.io/openstack-s2i-containers/openstack-tempest:master-latest
- name: RELATED_IMAGE_TEST_TOBIKO_IMAGE_URL_DEFAULT
value: quay.io/podified-antelope-centos9/openstack-tobiko:current-podified
value: quay.io/openstack-s2i-containers/openstack-tobiko:master-latest
- name: RELATED_IMAGE_TEST_ANSIBLETEST_IMAGE_URL_DEFAULT
value: quay.io/podified-antelope-centos9/openstack-ansible-tests:current-podified
value: quay.io/openstack-s2i-containers/openstack-ansible-test:master-latest
- name: RELATED_IMAGE_HORIZONTEST_IMAGE_URL_DEFAULT
value: quay.io/podified-antelope-centos9/openstack-horizontest:current-podified
value: quay.io/openstack-s2i-containers/openstack-horizontest:master-latest
8 changes: 4 additions & 4 deletions hack/export_related_images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash

export RELATED_IMAGE_TEST_TEMPEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-tempest-all:current-podified
export RELATED_IMAGE_TEST_TOBIKO_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-tobiko:current-podified
export RELATED_IMAGE_TEST_ANSIBLETEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-ansible-tests:current-podified
export RELATED_IMAGE_TEST_HORIZONTEST_IMAGE_URL_DEFAULT=quay.io/podified-antelope-centos9/openstack-horizontest:current-podified
export RELATED_IMAGE_TEST_TEMPEST_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-tempest:master-latest
export RELATED_IMAGE_TEST_TOBIKO_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-tobiko:master-latest
export RELATED_IMAGE_TEST_ANSIBLETEST_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-ansible-test:master-latest
export RELATED_IMAGE_TEST_HORIZONTEST_IMAGE_URL_DEFAULT=quay.io/openstack-s2i-containers/openstack-horizontest:master-latest
8 changes: 4 additions & 4 deletions test/functional/base_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,10 @@ func CreateTestOperatorConfigMap(namespace string) *corev1.ConfigMap {
Namespace: namespace,
},
Data: map[string]string{
"ansibletest-image": "quay.io/podified-antelope-centos9/openstack-ansibletest:current-podified",
"horizontest-image": "quay.io/podified-antelope-centos9/openstack-horizontest:current-podified",
"tempest-image": "quay.io/podified-antelope-centos9/openstack-tempest:current-podified",
"tobiko-image": "quay.io/podified-antelope-centos9/openstack-tobiko:current-podified",
"ansibletest-image": "quay.io/openstack-s2i-containers/openstack-ansible-test:master-latest",
"horizontest-image": "quay.io/openstack-s2i-containers/openstack-horizontest:master-latest",
"tempest-image": "quay.io/openstack-s2i-containers/openstack-tempest:master-latest",
"tobiko-image": "quay.io/openstack-s2i-containers/openstack-tobiko:master-latest",
},
}
}
Expand Down
Loading