Skip to content

Commit ac66f58

Browse files
committed
Extract CI vars for use in kolla-ansible jobs
Adapted for stable/stein (oraclelinux still tested) Change-Id: If58f15e18e420aca790496132352f1c1dcdb2640 Signed-off-by: Radosław Piliszek <[email protected]> (cherry picked from commit 8270ae2)
1 parent 6fd4b02 commit ac66f58

File tree

2 files changed

+12
-10
lines changed

2 files changed

+12
-10
lines changed

tests/playbooks/run.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,7 @@
11
---
22
- hosts: all
3-
vars:
4-
nodepool_rdo_proxy: "{{ zuul_site_mirror_fqdn }}:8080/rdo"
5-
nodepool_pypi_mirror: "http://{{ zuul_site_mirror_fqdn }}:8080/pypi/simple"
6-
nodepool_mirror_host: "{{ zuul_site_mirror_fqdn }}"
7-
nodepool_npmjs_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/registry.npmjs/"
8-
nodepool_elastic_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/elastic/"
9-
nodepool_grafana_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/grafana/"
10-
nodepool_cbs_centos_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/cbs.centos"
11-
nodepool_oraclelinux_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/oraclelinux/"
12-
nodepool_percona_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/percona"
3+
vars_files:
4+
- ../vars/zuul.yml
135
tasks:
146
- name: copy setup script
157
copy:

tests/vars/zuul.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
---
2+
nodepool_rdo_proxy: "{{ zuul_site_mirror_fqdn }}:8080/rdo"
3+
nodepool_pypi_mirror: "http://{{ zuul_site_mirror_fqdn }}:8080/pypi/simple"
4+
nodepool_mirror_host: "{{ zuul_site_mirror_fqdn }}"
5+
nodepool_npmjs_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/registry.npmjs/"
6+
nodepool_elastic_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/elastic/"
7+
nodepool_grafana_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/grafana/"
8+
nodepool_cbs_centos_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/cbs.centos"
9+
nodepool_oraclelinux_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/oraclelinux/"
10+
nodepool_percona_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/percona"

0 commit comments

Comments
 (0)