Watch the branched repo for updated install images

[James Laska]

Greetings,

I've been using the following changes on the internal production instance for the past
few weeks.  Since install images are available for the 'branch' repository,
I'd like to have post-tree-compose look there for installable images as well.  The
following patches:

 * update the default repoinfo.conf to add a 'branched' repo definition
 * update the post-tree-compose hook to monitor the 'branched' repo for new
install images

Alternative approaches:

 * I could have just used the existing 'f13' repo definition in repoinfo.conf, but
I'd rather define the 'branched' repo itself, and not have to change any hook
code when we change from f13 -> f14 (branched).
 * Since we no longer provide install images for 'rawhide', change the hook to
watch only the 'branched' repo instead of both, 'branched' and
'rawhide'.  I'd be okay with this, but my initial preference was to monitor
both.

Questions/concerns?

Thanks,
James

[PATCH 1/2] Add a [branched] repo

[James Laska]

---
 repoinfo.conf |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/repoinfo.conf b/repoinfo.conf
index 57f9627..d1dc535 100644
--- a/repoinfo.conf
+++ b/repoinfo.conf
@@ -13,6 +13,12 @@ arches = i386, x86_64
 path = development/rawhide
 url = %(rawhideurl)s
 
+[branched]
+arches = i386, x86_64
+# path will change when Fedora 13 is released
+path = development/13
+url = %(rawhideurl)s
+
 [f13]
 # path will change when Fedora 13 is released
 path = development/13
-- 
1.6.6.1

[PATCH 1/2] Add a [branched] repo

[Will Woods]

Good call - as you pointed out this makes it easier for the hooks, as
they can just monitor 'branched' and then we don't have to change them
when we branch for a new release. 

(I'm a little annoyed that we will still have to change repoinfo.conf
every time we branch, though. It's too bad there isn't a
"development/branched" symlink or something. Not a big deal, though.)

Please apply to master.

-w

On Thu, 2010-03-18 at 13:19 -0400, James Laska wrote:
>  ---
>   repoinfo.conf |    6 ++++++
>   1 files changed, 6 insertions(+), 0 deletions(-)
>  
>  diff --git a/repoinfo.conf b/repoinfo.conf
>  index 57f9627..d1dc535 100644
>  --- a/repoinfo.conf
>  +++ b/repoinfo.conf
>  @@ -13,6 +13,12 @@ arches = i386, x86_64
>   path = development/rawhide
>   url = %(rawhideurl)s
>   
>  +[branched]
>  +arches = i386, x86_64
>  +# path will change when Fedora 13 is released
>  +path = development/13
>  +url = %(rawhideurl)s
>  +
>   [f13]
>   # path will change when Fedora 13 is released
>   path = development/13

[PATCH 1/2] Add a [branched] repo

[James Laska]

On Wed, 2010-03-24 at 12:28 -0400, Will Woods wrote:
>  Good call - as you pointed out this makes it easier for the hooks,
> as
>  they can just monitor 'branched' and then we don't have to change them
>  when we branch for a new release. 
>  
>  (I'm a little annoyed that we will still have to change repoinfo.conf
>  every time we branch, though. It's too bad there isn't a
>  "development/branched" symlink or something. Not a big deal, though.) 
That's a good suggestion.  Jesse, would you be open for a rel-eng
request to add a symlink that always points to the current branch?  Or
is that a nightmare to maintain on the rel-eng side?

>  Please apply to master. 
Will do, thanks for input!

Thanks,
James

>  On Thu, 2010-03-18 at 13:19 -0400, James Laska wrote:
>  > ---
>  >  repoinfo.conf |    6 ++++++
>  >  1 files changed, 6 insertions(+), 0 deletions(-)
>  > 
>  > diff --git a/repoinfo.conf b/repoinfo.conf
>  > index 57f9627..d1dc535 100644
>  > --- a/repoinfo.conf
>  > +++ b/repoinfo.conf
>  > @@ -13,6 +13,12 @@ arches = i386, x86_64
>  >  path = development/rawhide
>  >  url = %(rawhideurl)s
>  >  
>  > +[branched]
>  > +arches = i386, x86_64
>  > +# path will change when Fedora 13 is released
>  > +path = development/13
>  > +url = %(rawhideurl)s
>  > +
>  >  [f13]
>  >  # path will change when Fedora 13 is released
>  >  path = development/13
>  
>  
>  _______________________________________________
>  autoqa-devel mailing list
>  autoqa-devel(a)lists.fedorahosted.org
>  https://fedorahosted.org/mailman/listinfo/autoqa-devel

[PATCH 1/2] Add a [branched] repo

[Jesse Keating]

On Wed, 2010-03-24 at 12:51 -0400, James Laska wrote:
>  
>  That's a good suggestion.  Jesse, would you be open for a rel-eng
>  request to add a symlink that always points to the current branch?  Or
>  is that a nightmare to maintain on the rel-eng side?
>  
>   
It was requested we name the tree after the release, for making use of
$releasever easier.  I'm not super opposed to having a symlink, but it
seems symlinks are a bit of trouble on the mirroring system.  Releng has
a SOP around setting up the new branched release, we could add to that
making sure AutoQA is updated to follow suite.

-- 
Jesse Keating
Fedora -- Freedom² is a feature!
identi.ca: http://identi.ca/jkeating

[PATCH 2/2] Also watch the branched repo for updated install images

[James Laska]

---
 hooks/post-tree-compose/watch-composes.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/hooks/post-tree-compose/watch-composes.py
b/hooks/post-tree-compose/watch-composes.py
index b776033..f9da800 100755
--- a/hooks/post-tree-compose/watch-composes.py
+++ b/hooks/post-tree-compose/watch-composes.py
@@ -26,7 +26,7 @@ parser.add_option('--dryrun', '--dry-run',
action='store_true',
 repoinfo.setarch('%%a') # two %% because of ConfigParser interpolation
 
 # Define a list of repos to watch, by name (see /etc/repoinfo.conf)
-watchcomposes = ['rawhide']
+watchcomposes = ['rawhide', 'branched']
 
 # Setup a cache path
 cachedir = '/var/cache/autoqa/watch-composes'
-- 
1.6.6.1

[PATCH 2/2] Also watch the branched repo for updated install images

[Will Woods]

So, if there are no install images for rawhide anymore, why bother
continuing to monitor it?

-w

On Thu, 2010-03-18 at 13:19 -0400, James Laska wrote:
>  ---
>   hooks/post-tree-compose/watch-composes.py |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>  
>  diff --git a/hooks/post-tree-compose/watch-composes.py
> b/hooks/post-tree-compose/watch-composes.py
>  index b776033..f9da800 100755
>  --- a/hooks/post-tree-compose/watch-composes.py
>  +++ b/hooks/post-tree-compose/watch-composes.py
>  @@ -26,7 +26,7 @@ parser.add_option('--dryrun', '--dry-run',
> action='store_true',
>   repoinfo.setarch('%%a') # two %% because of ConfigParser interpolation
>   
>   # Define a list of repos to watch, by name (see /etc/repoinfo.conf)
>  -watchcomposes = ['rawhide']
>  +watchcomposes = ['rawhide', 'branched']
>   
>   # Setup a cache path
>   cachedir = '/var/cache/autoqa/watch-composes'

[PATCH 2/2] Also watch the branched repo for updated install images

[James Laska]

On Wed, 2010-03-24 at 12:29 -0400, Will Woods wrote:
>  So, if there are no install images for rawhide anymore, why bother
>  continuing to monitor it? 
Hmm, good point.  I'll remove it, and adjust in the event planned
rawhide install images return.

Thanks,
James

>  On Thu, 2010-03-18 at 13:19 -0400, James Laska wrote:
>  > ---
>  >  hooks/post-tree-compose/watch-composes.py |    2 +-
>  >  1 files changed, 1 insertions(+), 1 deletions(-)
>  > 
>  > diff --git a/hooks/post-tree-compose/watch-composes.py
> b/hooks/post-tree-compose/watch-composes.py
>  > index b776033..f9da800 100755
>  > --- a/hooks/post-tree-compose/watch-composes.py
>  > +++ b/hooks/post-tree-compose/watch-composes.py
>  > @@ -26,7 +26,7 @@ parser.add_option('--dryrun', '--dry-run',
> action='store_true',
>  >  repoinfo.setarch('%%a') # two %% because of ConfigParser interpolation
>  >  
>  >  # Define a list of repos to watch, by name (see /etc/repoinfo.conf)
>  > -watchcomposes = ['rawhide']
>  > +watchcomposes = ['rawhide', 'branched']
>  >  
>  >  # Setup a cache path
>  >  cachedir = '/var/cache/autoqa/watch-composes'
>  
>  
>  _______________________________________________
>  autoqa-devel mailing list
>  autoqa-devel(a)lists.fedorahosted.org
>  https://fedorahosted.org/mailman/listinfo/autoqa-devel