airship/airshipctl
Code Issues Proposed changes

Fixed document pull issue in gate script 21

Browse Source 
Changed systemwide-executable to run in local_src_dir because the script needs
to build airshipctl binary first, before doc pull command can be invoked and populate
the remote_work_dir. Changed the order of the roles to allow systemwide-executable
to run before test-config and pull-docs.

Change-Id: Ia47423d91cdfb2dbbf0259344daab1c7b8cd47f5
Signed-off-by: James Gu <james.gu@att.com>
This commit is contained in:
James Gu 2020-05-06 11:20:02 -07:00
parent cb1833c3b3
commit 301de51467
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
playbooks/airship-airshipctl-test-runner.yaml
View File

@ -16,9 +16,9 @@
- name: set default roles - name: set default roles
set_fact: set_fact:
test_roles_default: test_roles_default:
- airshipctl-pull-docs
- airshipctl-systemwide-executable - airshipctl-systemwide-executable
- airshipctl-test-configs - airshipctl-test-configs
- airshipctl-pull-docs
- airshipctl-build-ephemeral-iso - airshipctl-build-ephemeral-iso
- install-kubectl - install-kubectl
- airshipctl-deploy-ephemeral-node - airshipctl-deploy-ephemeral-node

4
roles/airshipctl-systemwide-executable/tasks/main.yaml
View File

@ -12,7 +12,7 @@
- name: "make docker-image" - name: "make docker-image"
make: make:
chdir: "{{ remote_work_dir + '/airshipctl' if remote_work_dir is defined else zuul.project.src_dir }}" chdir: "{{ local_src_dir | default(zuul.project.src_dir) }}"
target: docker-image target: docker-image
params: params:
USE_PROXY: "{{ proxy.enabled }}" USE_PROXY: "{{ proxy.enabled }}"
@ -27,7 +27,7 @@
sudo docker cp "${CONTAINER}:/usr/local/bin/airshipctl" "/usr/local/bin/airshipctl" sudo docker cp "${CONTAINER}:/usr/local/bin/airshipctl" "/usr/local/bin/airshipctl"
docker rm "${CONTAINER}" docker rm "${CONTAINER}"
args: args:
chdir: "{{ remote_work_dir + '/airshipctl' if remote_work_dir is defined else zuul.project.src_dir }}" chdir: "{{ local_src_dir | default(zuul.project.src_dir) }}"
- name: "make sure airshipctl is executable" - name: "make sure airshipctl is executable"
command: airshipctl version command: airshipctl version