Merge "Changing container registry in testenv to quay"

openstack · Jun 6, 2022 · a70a36d · a70a36d
2 parents 1ee40ae + f04acda
commit a70a36d
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/toci-quickstart/config/testenv/multinode-psi.yml b/toci-quickstart/config/testenv/multinode-psi.yml
@@ -49,7 +49,7 @@ docker_registry_host: >-
   {%- elif job.consumer_job | default(false) | bool -%}
   {{ job.registry_ip_address_branch[release] }}:5001
   {%- else -%}
-  {%- if release in ["master"] -%}
+  {%- if (release not in ["victoria"] and ansible_distribution|lower in ["centos"]) -%}
   quay.rdoproject.org
   {%- else -%}
   trunk.registry.rdoproject.org

diff --git a/toci-quickstart/config/testenv/multinode-rdocloud.yml b/toci-quickstart/config/testenv/multinode-rdocloud.yml
@@ -50,7 +50,7 @@ docker_registry_host: >-
   {%- elif job.consumer_job | default(false) | bool -%}
   {{ job.registry_ip_address_branch[release] }}:5001
   {%- else -%}
-  {%- if release in ["master"] -%}
+  {%- if (release not in ["victoria"] and ansible_distribution|lower in ["centos"]) -%}
   quay.rdoproject.org
   {%- else -%}
   trunk.registry.rdoproject.org

diff --git a/toci-quickstart/config/testenv/multinode-vexxhost.yml b/toci-quickstart/config/testenv/multinode-vexxhost.yml
@@ -49,7 +49,7 @@ docker_registry_host: >-
   {%- elif job.consumer_job | default(false) | bool -%}
   {{ job.registry_ip_address_branch[release] }}:5001
   {%- else -%}
-  {%- if release in ["master"] -%}
+  {%- if (release not in ["victoria"] and ansible_distribution|lower in ["centos"]) -%}
   quay.rdoproject.org
   {%- else -%}
   trunk.registry.rdoproject.org

diff --git a/toci-quickstart/config/testenv/ovb-psi.yml b/toci-quickstart/config/testenv/ovb-psi.yml
@@ -35,7 +35,7 @@ docker_registry_host: >-
   {%- elif job.consumer_job | default(false) | bool -%}
   {{ job.registry_ip_address_branch[release] }}:5001
   {%- else -%}
-  {%- if release in ["master"] -%}
+  {%- if (release not in ["victoria"] and ansible_distribution|lower in ["centos"]) -%}
   quay.rdoproject.org
   {%- else -%}
   trunk.registry.rdoproject.org

diff --git a/toci-quickstart/config/testenv/ovb-rdocloud.yml b/toci-quickstart/config/testenv/ovb-rdocloud.yml
@@ -36,7 +36,7 @@ docker_registry_host: >-
   {%- elif job.consumer_job | default(false) | bool -%}
   {{ job.registry_ip_address_branch[release] }}:5001
   {%- else -%}
-  {%- if release in ["master"] -%}
+  {%- if (release not in ["victoria"] and ansible_distribution|lower in ["centos"]) -%}
   quay.rdoproject.org
   {%- else -%}
   trunk.registry.rdoproject.org

diff --git a/toci-quickstart/config/testenv/ovb-vexxhost.yml b/toci-quickstart/config/testenv/ovb-vexxhost.yml
@@ -35,7 +35,7 @@ docker_registry_host: >-
   {%- elif job.consumer_job | default(false) | bool -%}
   {{ job.registry_ip_address_branch[release] }}:5001
   {%- else -%}
-  {%- if release in ["master"] -%}
+  {%- if (release not in ["victoria"] and ansible_distribution|lower in ["centos"]) -%}
   quay.rdoproject.org
   {%- else -%}
   trunk.registry.rdoproject.org