Skip to content

Commit

Permalink
Change k8s ut job to use opentelekomcloud node (apache#182)
Browse files Browse the repository at this point in the history
* Change k8s ut job to use opentelekomcloud node
* Update k8s+keystone jobs to use external openstack provider
  • Loading branch information
liusheng authored and kiwik committed Apr 28, 2018
1 parent 60db68f commit 223ed09
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,12 @@
export LOG_LEVEL=4
# We want to use the openstack cloud provider
export CLOUD_PROVIDER=openstack
# We want to run a separate cloud-controller-manager for openstack
export EXTERNAL_CLOUD_PROVIDER=true
# DO NOT change the location of the cloud-config file. It is important for the old cinder provider to work
export CLOUD_CONFIG=/etc/kubernetes/cloud-config
# Specify the OCCM binary
export EXTERNAL_CLOUD_PROVIDER_BINARY="$PWD/openstack-cloud-controller-manager"
# location of where the kubernetes processes log their output
mkdir -p '{{ ansible_user_dir }}/workspace/logs/kubernetes'
Expand Down
4 changes: 2 additions & 2 deletions playbooks/cloud-provider-openstack-unittest/run.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
- hosts: all
become: yes
roles:
- export-vexxhost-openrc
- export-opentelekomcloud-openrc
tasks:
- name: Run unit tests with cloud-provider-openstack
shell:
Expand All @@ -14,4 +14,4 @@
TESTARGS='-v' make test 2>&1 | tee $TEST_RESULTS_TXT
executable: /bin/bash
chdir: '{{ k8s_specific_src_dir }}'
environment: '{{ golang_env | combine(vexxhost_openrc) }}'
environment: '{{ golang_env | combine(opentelekomcloud_openrc) }}'
3 changes: 2 additions & 1 deletion zuul.d/jobs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,8 @@
Run unit test of cloud-provider-openstack
run: playbooks/cloud-provider-openstack-unittest/run.yaml
secrets:
- vexxhost_credentials
- opentelekomcloud_credentials
nodeset: ubuntu-xenial-otc

- job:
name: cloud-provider-openstack-acceptance-test
Expand Down

0 comments on commit 223ed09

Please sign in to comment.