Merge lp://qastaging/~oddbloke/simplestreams/example-sync into lp://qastaging/~smoser/simplestreams/example-sync

Proposed by Dan Watkins
Status: Merged
Merged at revision: 25
Proposed branch: lp://qastaging/~oddbloke/simplestreams/example-sync
Merge into: lp://qastaging/~smoser/simplestreams/example-sync
Diff against target: 87 lines (+28/-12)
2 files modified
cstack-mirror (+12/-1)
setup (+16/-11)
To merge this branch: bzr merge lp://qastaging/~oddbloke/simplestreams/example-sync
Reviewer Review Type Date Requested Status
Scott Moser Needs Fixing
Review via email: mp+360083@code.qastaging.launchpad.net
To post a comment you must log in.
Revision history for this message
Scott Moser (smoser) wrote :

i think there are unrelated/unintended changes here that don't fit the commit message "Update to use simplestreams from git".

review: Needs Fixing
Revision history for this message
Dan Watkins (oddbloke) wrote :

On Tue, Dec 04, 2018 at 05:54:43PM -0000, Scott Moser wrote:
> > === modified file 'cstack-mirror'
> > --- cstack-mirror 2014-12-12 17:25:46 +0000
> > +++ cstack-mirror 2018-12-04 17:41:52 +0000
> > @@ -1,4 +1,4 @@
> > -#!/bin/sh
> > +#!/bin/sh -x
>
> i really prefer not to use 'set -x'.
> it just produces noise.
> if you'd like to make 'gmirror' print the command that it will execute, i'm not opposed to that.
>
> http://paste.ubuntu.com/p/ZBVzDF53J4/

I think we'll be able to `sh -x $scriptname` for both of these where we
call them; I'll test that.

> >
> > CLOUDNAME="canonistack"
> > SWIFT_PATH="simplestreams/data/" # production: simplestreams/data/
> > @@ -29,7 +29,7 @@
> > shift 3
> > [ "${MAX}" = "0" ] &&
> > { echo "skipping ${namepre}, MAX=0" 1>&2; return 0; }
> > - sstream-mirror-glance -vv \
> > + python2 $(which sstream-mirror-glance | sed s,/tools/,/bin/,) -vv \
>
> lets fix the tenv issue for tools and bin ordering rather than this sed.
> also, it seems wrong to call python2 explicitly here.
>
> did switching python3 to python2 do anything for you?

trusty doesn't have the Python 3 OpenStack libraries in the archive, so
using Python 2 is required.

Revision history for this message
Scott Moser (smoser) wrote :

hm.
i guess you've done reasonable work here.
the only problem is that it *only* works for python2 now, which is not really what is or should be the default operating environment. seems more relevant to try to use python3.

heres a suggestion.
http://paste.ubuntu.com/p/bZB6nmW9s6/

Revision history for this message
Dan Watkins (oddbloke) wrote :

That change has been integrated, and confirmed working on trusty.

Revision history for this message
Scott Moser (smoser) wrote :

not sure why this iddn't get marked merged.
it is in revno 25
https://bazaar.launchpad.net/~smoser/simplestreams/example-sync/revision/25

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to status/vote changes: