Skip to content

Commit c9b9f98

Browse files
liushengZhuli
authored andcommitted
Revert changes from b4b9529 (apache#174)
1 parent 0727c86 commit c9b9f98

File tree

4 files changed

+6
-28
lines changed
  • playbooks

4 files changed

+6
-28
lines changed

playbooks/cloud-provider-openstack-acceptance-test-csi-cinder/post.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
set -x
99
cd ${GOPATH}/src/k8s.io/kubernetes
1010
cluster/kubectl.sh config use-context local
11-
cluster/kubectl.sh delete -f '{{ ansible_user_dir }}/src/k8s.io/cloud-provider-openstack/examples/cinder-csi-plugin/nginx.yaml'
12-
cluster/kubectl.sh delete -f '{{ ansible_user_dir }}/src/k8s.io/cloud-provider-openstack/manifests/cinder-csi-plugin'
11+
cluster/kubectl.sh delete -f '{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/examples/cinder-csi-plugin/nginx.yaml'
12+
cluster/kubectl.sh delete -f '{{ ansible_user_dir }}/{{ zuul.project.src_dir }}/manifests/cinder-csi-plugin'
1313
executable: /bin/bash
1414
environment: '{{ golang_env }}'

playbooks/cloud-provider-openstack-acceptance-test-csi-cinder/run.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,4 +156,5 @@
156156
exit 1
157157
fi
158158
executable: /bin/bash
159+
chdir: '{{ zuul.project.src_dir }}'
159160
environment: '{{ golang_env | combine(vexxhost_openrc) }}'

playbooks/cloud-provider-openstack-acceptance-test/pre.yaml

Lines changed: 2 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,26 +3,15 @@
33
roles:
44
- install-k8s
55
tasks:
6-
- name: rsync cloud-provider-openstack to k8s.io
7-
shell:
8-
cmd: |
9-
set -x
10-
set -e
11-
set -o pipefail
12-
13-
mkdir -p k8s.io
14-
rsync -avz --progress src/github.com/kubernetes/ src/k8s.io/
15-
executable: /bin/bash
16-
environment: '{{ golang_env | combine(vexxhost_openrc) }}'
17-
186
- name: Install dependencies for cloud-provider-openstack acceptance test
197
shell:
208
cmd: |
219
set -x
2210
set -e
2311
2412
# Install dependencies
25-
cd src/k8s.io/cloud-provider-openstack
2613
go get -u github.com/Masterminds/glide
14+
2715
executable: /bin/bash
16+
chdir: '{{ zuul.project.src_dir }}'
2817
environment: '{{ golang_env }}'

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

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,6 @@
33
roles:
44
- export-vexxhost-openrc
55
tasks:
6-
- name: Copy all github.com/project to k8s.io
7-
shell:
8-
cmd: |
9-
set -x
10-
set -e
11-
set -o pipefail
12-
13-
mkdir -p k8s.io
14-
rsync -avz --progress src/github.com/kubernetes/ src/k8s.io/
15-
executable: /bin/bash
16-
environment: '{{ golang_env | combine(vexxhost_openrc) }}'
17-
186
- name: Run unit tests with cloud-provider-openstack
197
shell:
208
cmd: |
@@ -23,7 +11,7 @@
2311
set -o pipefail
2412
2513
go get -u github.com/Masterminds/glide
26-
cd src/k8s.io/cloud-provider-openstack
2714
TESTARGS='-v' make test 2>&1 | tee $TEST_RESULTS_TXT
2815
executable: /bin/bash
16+
chdir: '{{ zuul.project.src_dir }}'
2917
environment: '{{ golang_env | combine(vexxhost_openrc) }}'

0 commit comments

Comments
 (0)