Skip to content

Commit 223ed09

Browse files
liushengkiwik
authored andcommitted
Change k8s ut job to use opentelekomcloud node (apache#182)
* Change k8s ut job to use opentelekomcloud node * Update k8s+keystone jobs to use external openstack provider
1 parent 60db68f commit 223ed09

File tree

3 files changed

+9
-4
lines changed
  • playbooks
    • cloud-provider-openstack-acceptance-test-keystone-authentication-authorization
    • cloud-provider-openstack-unittest
  • zuul.d

3 files changed

+9
-4
lines changed

playbooks/cloud-provider-openstack-acceptance-test-keystone-authentication-authorization/run.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,12 @@
7070
export LOG_LEVEL=4
7171
# We want to use the openstack cloud provider
7272
export CLOUD_PROVIDER=openstack
73+
# We want to run a separate cloud-controller-manager for openstack
74+
export EXTERNAL_CLOUD_PROVIDER=true
75+
# DO NOT change the location of the cloud-config file. It is important for the old cinder provider to work
7376
export CLOUD_CONFIG=/etc/kubernetes/cloud-config
74-
77+
# Specify the OCCM binary
78+
export EXTERNAL_CLOUD_PROVIDER_BINARY="$PWD/openstack-cloud-controller-manager"
7579
7680
# location of where the kubernetes processes log their output
7781
mkdir -p '{{ ansible_user_dir }}/workspace/logs/kubernetes'

playbooks/cloud-provider-openstack-unittest/run.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
- hosts: all
22
become: yes
33
roles:
4-
- export-vexxhost-openrc
4+
- export-opentelekomcloud-openrc
55
tasks:
66
- name: Run unit tests with cloud-provider-openstack
77
shell:
@@ -14,4 +14,4 @@
1414
TESTARGS='-v' make test 2>&1 | tee $TEST_RESULTS_TXT
1515
executable: /bin/bash
1616
chdir: '{{ k8s_specific_src_dir }}'
17-
environment: '{{ golang_env | combine(vexxhost_openrc) }}'
17+
environment: '{{ golang_env | combine(opentelekomcloud_openrc) }}'

zuul.d/jobs.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,8 @@
251251
Run unit test of cloud-provider-openstack
252252
run: playbooks/cloud-provider-openstack-unittest/run.yaml
253253
secrets:
254-
- vexxhost_credentials
254+
- opentelekomcloud_credentials
255+
nodeset: ubuntu-xenial-otc
255256

256257
- job:
257258
name: cloud-provider-openstack-acceptance-test

0 commit comments

Comments
 (0)