Merge lp:~chris.macnaughton/ubuntu-openstack-ci/fixed-index into lp:ubuntu-openstack-ci

Proposed by Chris MacNaughton
Status: Merged
Merged at revision: 420
Proposed branch: lp:~chris.macnaughton/ubuntu-openstack-ci/fixed-index
Merge into: lp:ubuntu-openstack-ci
Diff against target: 21 lines (+2/-2)
1 file modified
run/job-parts/osci_gerrit_common.sh (+2/-2)
To merge this branch: bzr merge lp:~chris.macnaughton/ubuntu-openstack-ci/fixed-index
Reviewer Review Type Date Requested Status
Frode Nordahl Approve
Review via email: mp+374115@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Frode Nordahl (fnordahl) wrote :

LGTM, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'run/job-parts/osci_gerrit_common.sh'
--- run/job-parts/osci_gerrit_common.sh 2018-12-14 08:00:05 +0000
+++ run/job-parts/osci_gerrit_common.sh 2019-10-15 08:05:59 +0000
@@ -288,7 +288,7 @@
288 add_line " <table>"288 add_line " <table>"
289289
290 # Get index string from key 4, reverse sort by key 2 (date)290 # Get index string from key 4, reverse sort by key 2 (date)
291 INDICES=$(timeout 600 swift list uosci-artifacts -l | grep -e 'index.html$' | grep -v ' index.html' | sort -rk 2 | awk '{ print $4 }')291 INDICES=$(timeout 600 swift list uosci-artifacts -l | grep -e 'index.html$' | grep -v ' index.html' | sort -rk 2 | awk '{ print $5 }')
292292
293 for i in $INDICES; do293 for i in $INDICES; do
294 # link="<a href=\"${i}\">VIEW</a>"294 # link="<a href=\"${i}\">VIEW</a>"
@@ -297,7 +297,7 @@
297 # add_line " $row_linked"297 # add_line " $row_linked"
298298
299 link="<a href=\"${i}\">${i%"/index.html"}</a>"299 link="<a href=\"${i}\">${i%"/index.html"}</a>"
300 row="<tr><td style=\"text-align:left;\">$link</td</tr>"300 row="<tr><td style=\"text-align:left;\">$link</td></tr>"
301 add_line " $row"301 add_line " $row"
302 done302 done
303 add_line " </table>"303 add_line " </table>"

Subscribers

People subscribed via source and target branches