diff --git a/tools/gate/playbooks/dev-deploy-ceph.yaml b/tools/gate/playbooks/dev-deploy-ceph.yaml index 04447449a6..04bc1efc5e 100644 --- a/tools/gate/playbooks/dev-deploy-ceph.yaml +++ b/tools/gate/playbooks/dev-deploy-ceph.yaml @@ -21,6 +21,7 @@ environment: OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" + zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" args: chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - name: Deploy Required packages @@ -30,6 +31,7 @@ environment: OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" + zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" args: chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - name: Setup OS and K8s Clients diff --git a/tools/gate/playbooks/dev-deploy-nfs.yaml b/tools/gate/playbooks/dev-deploy-nfs.yaml index d6784fde22..ab921aa31e 100644 --- a/tools/gate/playbooks/dev-deploy-nfs.yaml +++ b/tools/gate/playbooks/dev-deploy-nfs.yaml @@ -21,6 +21,7 @@ environment: OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" + zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" args: chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - name: Deploy Required packages @@ -30,6 +31,7 @@ environment: OSH_EXTRA_HELM_ARGS: "{{ zuul_osh_extra_helm_args_relative_path | default('') }}" OSH_INFRA_PATH: "{{ zuul_osh_infra_relative_path | default('') }}" + zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" args: chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - name: Setup OS and K8s Clients diff --git a/tools/gate/playbooks/ironic-deploy.yaml b/tools/gate/playbooks/ironic-deploy.yaml index 682fd24f61..d1391c8e1a 100644 --- a/tools/gate/playbooks/ironic-deploy.yaml +++ b/tools/gate/playbooks/ironic-deploy.yaml @@ -18,12 +18,16 @@ shell: | set -xe; ./tools/deployment/baremetal/000-install-packages.sh + environment: + zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" args: chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - name: Setup Nodes shell: | set -xe; ./tools/deployment/baremetal/005-setup-nodes.sh + environment: + zuul_site_mirror_fqdn: "{{ zuul_site_mirror_fqdn }}" args: chdir: "{{ zuul_osh_relative_path | default(zuul.project.src_dir) }}" - name: Deploy clients diff --git a/tools/gate/playbooks/vars.yaml b/tools/gate/playbooks/vars.yaml index 31ea631dfa..9f82d9ec36 100644 --- a/tools/gate/playbooks/vars.yaml +++ b/tools/gate/playbooks/vars.yaml @@ -13,8 +13,8 @@ # limitations under the License. version: - kubernetes: v1.9.3 - helm: v2.7.2 + kubernetes: v1.10.2 + helm: v2.8.2 cni: v0.6.0 proxy: