Merge lp:~ajkavanagh/ubuntu-openstack-ci/fix-port-clean-up-tox into lp:ubuntu-openstack-ci

Proposed by Alex Kavanagh
Status: Merged
Approved by: Aurelien Lourot
Approved revision: 448
Merged at revision: 448
Proposed branch: lp:~ajkavanagh/ubuntu-openstack-ci/fix-port-clean-up-tox
Merge into: lp:ubuntu-openstack-ci
Diff against target: 17 lines (+2/-2)
1 file modified
run/job-parts/osci_job_common.sh (+2/-2)
To merge this branch: bzr merge lp:~ajkavanagh/ubuntu-openstack-ci/fix-port-clean-up-tox
Reviewer Review Type Date Requested Status
Aurelien Lourot (community) Approve
Review via email: mp+400972@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Aurelien Lourot (aurelien-lourot) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'run/job-parts/osci_job_common.sh'
2--- run/job-parts/osci_job_common.sh 2020-11-13 10:38:11 +0000
3+++ run/job-parts/osci_job_common.sh 2021-04-12 13:17:11 +0000
4@@ -466,11 +466,11 @@
5 deactivate ||:
6
7 # Tool should be present before now, but if it's not, get it!
8- stat $UOSCI_BOT_CONTROL_ROOT/tox.ini ||\
9+ stat $UOSCI_BOT_CONTROL_ROOT/tools/tox.ini ||\
10 f_tool_refresh_bot_control
11
12 # Venv may have already been built, but if not, build it!
13- stat $UOSCI_BOT_CONTROL_ROOT/.tox/port-cleanup ||\
14+ stat $UOSCI_BOT_CONTROL_ROOT/tools/.tox/port-cleanup ||\
15 (
16 cd $UOSCI_BOT_CONTROL_ROOT/tools
17 tox -e port-cleanup

Subscribers

People subscribed via source and target branches