Skip to content

Commit

Permalink
Fix CPO job openrc bug (apache#619)
Browse files Browse the repository at this point in the history
the `secrets` in the job definition is not inheritable. Create a
new base job for lb related job on vexxhost provider.
  • Loading branch information
wangxiyuan authored Aug 19, 2019
1 parent 94a99af commit 0de6748
Showing 1 changed file with 18 additions and 3 deletions.
21 changes: 18 additions & 3 deletions zuul.d/jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -708,18 +708,33 @@
post-run: playbooks/cloud-provider-openstack-acceptance-test-manila-provisioner/post.yaml
nodeset: ubuntu-xenial

# TODO(wxy): Delete this base job once lb job is moved to citynetwork.
- job:
name: cloud-provider-openstack-test-lb
parent: golang-test
description: |
Base job for all types of cloud-provider-openstack-acceptance-test-lb-octavia test jobs
pre-run: playbooks/cloud-provider-openstack-test/pre.yaml
post-run: playbooks/cloud-provider-openstack-test/post.yaml
secrets:
- vexxhost_credentials
vars:
k8s_os_provider_src_dir: '{{ ansible_user_dir }}/src/k8s.io/cloud-provider-openstack'
k8s_src_dir: '{{ ansible_user_dir }}/src/k8s.io/kubernetes'
k8s_log_dir: '{{ ansible_user_dir }}/workspace/logs/kubernetes'
kubectl: '{{ ansible_user_dir }}/src/k8s.io/kubernetes/cluster/kubectl.sh'
cloud_name: vexxhost

# TODO(wxy): Move lb test to citynetwork once octavia is available on
# citynetwork.
- job:
name: cloud-provider-openstack-acceptance-test-lb-octavia
parent: cloud-provider-openstack-test
parent: cloud-provider-openstack-test-lb
description: |
Run lb acceptance tests of cloud-provider-openstack
run: playbooks/cloud-provider-openstack-acceptance-test-lb-octavia/run.yaml
post-run: playbooks/cloud-provider-openstack-acceptance-test-lb-octavia/post.yaml
nodeset: ubuntu-xenial-vexxhost-lb
vars:
cloud_name: vexxhost
secrets:
- vexxhost_credentials

Expand Down

0 comments on commit 0de6748

Please sign in to comment.