← Back to branch summary

~josvaz/vmbuilder/jenkins_kvm-fix-yakkety

« back to all changes in this revision

Viewing changes to jenkins/MAASv2_Cleaner.sh

  • Committer: Daniel Watkins
  • Date: 2016-08-01 15:30:35 UTC
  • mto: This revision was merged to the branch mainline in revision 756.
  • Revision ID: daniel.watkins@canonical.com-20160801153035-gojbwsuvv7ju3juc
Use dpkg for all should_build.py version comparisons

Prior to this commit, we were using dpkg to compare the archive version against
the manifest version.  However, we weren't using it to compare versions from
different archive pockets, which meant that once precise-updates' kernel ticked
up to 3.2.0.100.something, it started comparing lower than the release's
3.2.0.23.something, meaning automated promotion stopped happening.

This should address that issue.

Show diffs side-by-side

added added

removed removed

Lines of Context:
jenkins/MAASv2_Cleaner.sh
1
1
#!/bin/bash
2
2
#
3
 
# Clean up MAAS2 v2/v3 builds/streams
 
3
# Clean up MAASv2 builds
4
4
#
5
5
my_dir="$(dirname $0)"
6
6
my_p_dir="$(dirname $my_dir)"
24
24
check_branch ${BZR_SIMPLESTREAMS:-lp:simplestreams} ${sstreams}
25
25
check_branch ${BZR_MAASv2:-lp:maas-images} ${maasv2}
26
26
 
27
 
for METADATA_ROOT in /srv/maas-images/ephemeral-v2/daily/ \
28
 
                     /srv/maas-images/ephemeral-v3/daily/;  do
29
 
    run PYTHONPATH=${sstreams}:${maasv2} \
30
 
        ${maasv2}/bin/meph2-util clean-md \
31
 
            ${MAX_BUILDS} ${METADATA_ROOT}/${INDEX_PATH}
32
 
 
33
 
    run PYTHONPATH=${sstreams}:${maasv2} \
34
 
        ${maasv2}/bin/meph2-util find-orphans \
35
 
            ${OUTDIR}/daily.json \
36
 
            ${METADATA_ROOT} ${METADATA_ROOT}/${INDEX_PATH}
37
 
 
38
 
    run PYTHONPATH=${sstreams}:${maasv2} \
39
 
        ${maasv2}/bin/meph2-util reap-orphans \
40
 
            --older ${REAP_AGE} \
41
 
            ${OUTDIR}/daily-v3.json \
42
 
            ${METADATA_ROOT}
43
 
done
 
27
#DAILIES
 
28
run PYTHONPATH=${sstreams}:${maasv2} \
 
29
    ${maasv2}/bin/meph2-util clean-md \
 
30
        ${MAX_BUILDS} ${DAILY_ROOT}/${INDEX_PATH}
 
31
 
 
32
run PYTHONPATH=${sstreams}:${maasv2} \
 
33
    ${maasv2}/bin/meph2-util find-orphans \
 
34
        ${OUTDIR}/daily.json \
 
35
        ${DAILY_ROOT} ${DAILY_ROOT}/${INDEX_PATH}
 
36
 
 
37
run PYTHONPATH=${sstreams}:${maasv2} \
 
38
    ${maasv2}/bin/meph2-util reap-orphans \
 
39
        --older ${REAP_AGE} \
 
40
        ${OUTDIR}/daily.json \
 
41
        ${DAILY_ROOT}
 
42
 
 
43
# RELEASES
 
44
run PYTHONPATH=${sstreams}:${maasv2} \
 
45
    ${maasv2}/bin/meph2-util clean-md \
 
46
        ${MAX_BUILDS} ${DAILY_ROOT}/${INDEX_PATH}
 
47
 
 
48
run PYTHONPATH=${sstreams}:${maasv2} \
 
49
    ${maasv2}/bin/meph2-util find-orphans \
 
50
        ${OUTDIR}/releases.json \
 
51
        ${RELEASE_ROOT} ${RELEASE_ROOT}/${INDEX_PATH}
 
52
 
 
53
run PYTHONPATH=${sstreams}:${maasv2} \
 
54
    ${maasv2}/bin/meph2-util reap-orphans \
 
55
        --older ${REAP_AGE} \
 
56
        ${OUTDIR}/releases.json \
 
57
        ${RELEASE_ROOT}