Changeset 1587


Ignore:
Timestamp:
May 24, 2012, 12:13:44 AM (7 years ago)
Author:
bruno
Message:
  • pbtest goes much further now, even if it doesn't run fully without errors yet. Remains to see the VE part mainly
File:
1 edited

Legend:

Unmodified
Added
Removed
  • devel/pb/t/pbtest

    r1582 r1587  
    99
    1010# First create a dummy account for testing
    11 # In order for this script to run well, you hould have sudo access
     11# In order for this script to run well, you should have sudo access
    1212
    1313# You may have multiple distros here
     
    1616TESTVMDIST="fedora-16-i386"
    1717TESTVMISO="/users/bruno/iso/Fedora-16-i386-DVD.iso"
    18 
    19 # Sub finction to handle execution as pbtest
     18PBTEST="/home/pbtest"
     19export PBPROJ=afio
     20
     21# Sub function to handle execution as pbtest
     22# doesn't change to the home dir of the user as su - can't be used to get env var correct
    2023sudopbtest() {
    2124
    2225cmd=$1
    23 
    24 echo "INFO pbtest: Now running $cmd"
     26msg=$2
     27
     28if [ _"$cmd" == _"/tmp/pbtestcmd" ]; then
     29    echo "INFO (as pbtest): Now running `head -1 $cmd` [$msg]"
     30else
     31    echo "INFO (as pbtest): Now running $cmd [$msg]"
     32fi
    2533sudo su - pbtest -c "$cmd"
     34ret=$?
     35if [ $ret -ne 0 ] && [ _"$msg" == _"" ]; then
     36    echo "================================"
     37    echo "ERROR: Command $cmd failed: $ret"
     38    echo "================================"
     39fi
     40echo " "
    2641}
    2742
    28 
    29 sudo rm -rf ~pbtest/* ~pbtest/.??*
    30 sudo userdel pbtest
    31 sudo groupdel pbtest
    32 sudo useradd pbtest
    33 sudo grep -q pbtest /etc/sudoers
     43sudocmd() {
     44cmd=$1
     45
     46echo "INFO (as root): Now running $cmd"
     47sudo $cmd
     48ret=$?
     49if [ $ret -ne 0 ]; then
     50    echo "================================"
     51    echo "ERROR: Command $cmd failed: $ret"
     52    echo "================================"
     53fi
     54echo " "
     55}
     56
     57
     58sudocmd "rm -rf $PBTEST/* $PBTEST/.??*"
     59sudocmd "killall -u pbtest"
     60sudocmd "userdel pbtest"
     61sudocmd "groupdel pbtest"
     62sudocmd "useradd pbtest"
     63sudocmd "grep -q pbtest /etc/sudoers"
    3464if [ $? -ne 0 ]; then
    3565    cat > /tmp/sudoers << EOF
     66Defaults env_keep += "PBPROJ"
    3667pbtest localhost=NOPASSWD:/usr/sbin/chroot
     68pbtest localhost=NOPASSWD:/usr/bin/rpmbootstrap
    3769pbtest localhost=NOPASSWD:/bin/cp
    3870EOF
    39     sudo cat /etc/sudoers /tmp/sudoers > /tmp/sudoers2
    40     sudo chmod 440 /tmp/sudoers2
    41     sudo chown root:root /tmp/sudoers2
    42     sudo mv /tmp/sudoers2 /etc/sudoers
     71    sudocmd "cat /etc/sudoers /tmp/sudoers > /tmp/sudoers2"
     72    sudocmd "chmod 440 /tmp/sudoers2"
     73    sudocmd "chown root:root /tmp/sudoers2"
     74    sudocmd "mv /tmp/sudoers2 /etc/sudoers"
    4375    rm -f /tmp/sudoers /tmp/sudoers2
    4476fi
    4577# Force pbtest account
    46 sudo perl -pi -e 's|^pbtest:.*|pbtest:$2a$08$2Q.tEty4v/fU0RyPeDelk.AjLAtXUXU3DpSs/l/8YrFmau1LJRCqC:15483:0:99999:7:::|' /etc/shadow
    47 PBTEST="`echo ~pbtest`"
     78sudocmd "perl -pi -e 's|^pbtest:.*|pbtest:$2a$08$2Q.tEty4v/fU0RyPeDelk.AjLAtXUXU3DpSs/l/8YrFmau1LJRCqC:15483:0:99999:7:::|' /etc/shadow"
     79cat > /tmp/.profile << EOF
     80export PBPROJ=$PBPROJ
     81EOF
     82sudocmd "mv /tmp/.profile $PBTEST/.profile"
     83sudocmd "chown pbtest:pbtest $PBTEST/.profile"
     84sudopbtest "env | grep PBPROJ"
    4885
    4986#Taken from Lab document originally
     
    5592* = r
    5693EOF
    57 sudo mv /tmp/authz ~pbtest/svn/conf/authz
     94sudocmd "mv /tmp/authz $PBTEST/svn/conf/authz"
    5895cat > /tmp/passwd << EOF
    5996[users]
    6097pbtest = pbtest
    6198EOF
    62 sudo mv /tmp/passwd ~pbtest/svn/conf/passwd
     99sudocmd "mv /tmp/passwd $PBTEST/svn/conf/passwd"
    63100cat > /tmp/svnserve.conf << EOF
    64101[general]
     
    69106realm = pb
    70107EOF
    71 sudo mv /tmp/svnserve.conf ~pbtest/svn/conf/svnserve.conf
    72 sudo chown pbtest:pbtest ~pbtest/svn/conf/authz ~pbtest/svn/conf/passwd ~pbtest/svn/conf/svnserve.conf
    73 sudopbtest "killall svnserve ; svnserve -d -r ~pbtest/svn"
    74 sudopbtest "mkdir pb ftp ve .ssh; chmod 700 .ssh"
    75 
    76 sudopbtest "pb --version"
     108sudocmd "mv /tmp/svnserve.conf $PBTEST/svn/conf/svnserve.conf"
     109sudocmd "chown pbtest:pbtest $PBTEST/svn/conf/authz $PBTEST/svn/conf/passwd $PBTEST/svn/conf/svnserve.conf"
     110sudopbtest "killall svnserve" 1
     111sudopbtest "svnserve -d -r $PBTEST/svn"
     112sudopbtest "mkdir -p $PBTEST/{ftp,ve,vm,.ssh,pb}"
     113sudopbtest "chmod 700 $PBTEST/.ssh"
     114
     115sudopbtest "pb -h"
    77116sudopbtest "pbdistrocheck"
    78 sudopbtest "pb clean 2>&1 > /dev/null"
     117sudopbtest "pb clean 2>&1 > /dev/null" 1
    79118
    80119cat > /tmp/.pbrc << EOF
     
    82121pbconfurl afio = svn://localhost/pb/afio/pbconf
    83122pbdefdir default = \$ENV{'HOME'}/pb
    84 pbconfurl projtest = dir://\$ENV{'HOME'}/projtest
    85 pbconfdir projtest = \$ENV{'HOME'}/projtest/pbconf
    86 pburl projtest = svn+ssh://svn.project-builder.org/svn/pb
    87123pbconfurl pb = svn://svn.project-builder.org/pb/pbconf
    88124pbconfdir pb = \$ENV{'HOME'}/pb/pbconf
    89125pburl pb = svn://svn.project-builder.org/pb
    90126pburl mondorescue = svn://svn.mondorescue.org/mondorescue/branches
     127sshhost pb = localhost
     128sshlogin pb = pbtest
     129sshdir pb = \$ENV{'HOME'}/ftp
    91130#
    92131pbpackager default = Big Chief <bigchief@hp.com>
     
    94133pbparallel pb = 6
    95134vepath default = \$ENV{'HOME'}/ve
     135vmpath default = \$ENV{'HOME'}/tmp
     136EOF
     137sudocmd "mv /tmp/.pbrc $PBTEST/.pbrc"
     138
     139cat > /tmp/.pbrc << EOF
    96140vmtype default = kvm
    97141vmcmd default = qemu-kvm
    98 vmpath default = \$ENV{'HOME'}/tmp
    99142vmsize fedora = 10G
    100143vmmonport default = 4000
    101144EOF
    102 sudo mv /tmp/.pbrc ~pbtest/.pbrc
    103 
    104 sudopbtest "pb -p afio getconf"
     145echo "vmlist default = `echo $TESTVMDIST | sed 's/ */,/g'`" >> /tmp/.pbrc
     146sudocmd "mv /tmp/.pbrc $PBTEST/vm/.pbrc"
    105147
    106148cat > /tmp/.pbrc << EOF
     
    113155velogin default = pbtest
    114156EOF
    115 echo "velist default = `echo $TESTVEDIST | sed 's/ */,/g'`" >> /tmp/.pbrc
    116 sudo mv /tmp/.pbrc ~pbtest/ve/.pbrc
    117 sudo chown pbtest:pbtest ~pbtest/.pbrc ~pbtest/ve/.pbrc
    118 
    119 sudopbtest "ssh-keygen -f .ssh/id_rsa -t rsa -b 768 -v -N ''"
    120 sudopbtest "cp .ssh/id_rsa.pub .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys ; chmod 600 .ssh/id_rsa.pub"
    121 sudopbtest "ssh localhost touch ftp/README"
     157echo "velist default = `echo $TESTVEDIST | sed 's/ /,/g'`" >> /tmp/.pbrc
     158sudocmd "mv /tmp/.pbrc $PBTEST/ve/.pbrc"
     159sudocmd "chown pbtest:pbtest $PBTEST/.pbrc $PBTEST/ve/.pbrc $PBTEST/vm/.pbrc"
     160
     161sudopbtest "ssh-keygen -f $PBTEST/.ssh/id_rsa -t rsa -b 768 -v -N ''"
     162sudopbtest "cp $PBTEST/.ssh/id_rsa.pub $PBTEST/.ssh/authorized_keys"
     163sudopbtest "chmod 600 $PBTEST/.ssh/authorized_keys $PBTEST/.ssh/id_rsa.pub"
     164sudopbtest "ssh localhost touch $PBTEST/ftp/README"
    122165
    123166# Create SVN conf files - doesn't work fully as it asks for a password - solved with PBVCSOPT
    124 sudopbtest "svn info 2>&1 > /dev/null"
     167sudopbtest "svn info 2>&1 > /dev/null" 1
    125168cat > /tmp/servers << EOF
    126169[global]
     
    129172store-auth-creds = yes
    130173EOF
    131 sudo mv /tmp/servers ~pbtest/.subversion/servers
    132 sudo chown pbtest:pbtest ~pbtest/.subversion/servers
     174sudocmd "mv /tmp/servers $PBTEST/.subversion/servers"
     175sudocmd "chown pbtest:pbtest $PBTEST/.subversion/servers"
    133176
    134177VCSOPT='--username pbtest --password pbtest'
    135178
    136 sudopbtest "svn import pb svn://localhost/pb -m 'Initial creation of pb repo' $VCSOPT"
    137 sudopbtest "cd pb ; svn co svn://localhost/pb ."
    138 sudopbtest "cd pb ; touch README ; svn add README ; svn ci --username pbtest --password pbtest -m 'add readme' README"
    139 sudopbtest "export PBVCSOPT=\"$VCSOPT\" ; pb -p afio -r 2.5 newproj afio"
    140 
    141 grep -vE '^defpkgdir|^projver|^projtag|^pburl|^pbrepo|^shh' ~pbtest/pb/afio/pbconf/2.5/afio.pb > /tmp/afio.pb
     179sudopbtest "svn import $PBTEST/pb svn://localhost/pb -m 'Initial creation of pb repo' $VCSOPT"
     180sudopbtest "svn co svn://localhost/pb $PBTEST/pb"
     181sudopbtest "touch $PBTEST/pb/README"
     182sudopbtest "svn add $PBTEST/pb/README"
     183sudopbtest "svn ci --username pbtest --password pbtest -m 'add readme' $PBTEST/pb/README"
     184sudopbtest "PBVCSOPT=\"$VCSOPT\" pb -r 2.5 newproj afio"
     185
     186grep -vE '^defpkgdir|^projver|^projtag|^pburl|^pbrepo|^shh' $PBTEST/pb/afio/pbconf/2.5/afio.pb > /tmp/afio.pb
    142187cat >> /tmp/afio.pb << EOF
    143188defpkgdir afio = dummy
     
    150195sshdir afio = \$ENV{'HOME'}/ftp
    151196EOF
    152 sudo mv /tmp/afio.pb ~pbtest/pb/afio/pbconf/2.5/afio.pb
    153 sudo perl -pi -e 's|testver afio = true|testver afio = false|' ~pbtest/pb/afio/pbconf/2.5/afio.pb
    154 sudo chown pbtest:pbtest ~pbtest/pb/afio/pbconf/2.5/afio.pb
    155 
    156 grep -vE 'PBSRC|PBDESC|PBSUMMARY|PBURL|PBLOG' ~pbtest/pb/afio/pbconf/2.5/pbfilter/all.pbf > /tmp/all.pbf
     197sudocmd "mv /tmp/afio.pb $PBTEST/pb/afio/pbconf/2.5/afio.pb"
     198sudocmd "chown pbtest:pbtest $PBTEST/pb/afio/pbconf/2.5/afio.pb"
     199cat > /tmp/pbtestcmd << EOF
     200perl -pi -e 's|testver\s+afio\s+=\s+true|testver\ afio\ =\ false|' $PBTEST/pb/afio/pbconf/2.5/afio.pb
     201EOF
     202chmod 755 /tmp/pbtestcmd
     203sudopbtest /tmp/pbtestcmd
     204
     205grep -vE 'PBSRC|PBDESC|PBSUMMARY|PBURL|PBLOG' $PBTEST/pb/afio/pbconf/2.5/pbfilter/all.pbf > /tmp/all.pbf
    157206cat >> /tmp/all.pbf << EOF
    158207filter PBSRC = src/%{name}-%{version}.tar.gz
     
    162211filter PBLOG = no
    163212EOF
    164 sudo mv /tmp/all.pbf ~pbtest/pb/afio/pbconf/2.5/pbfilter/all.pbf
    165 sudo chown pbtest:pbtest ~pbtest/pb/afio/pbconf/2.5/pbfilter/all.pbf
    166 
    167 grep -vE 'PBGRP|PBLIC' ~pbtest/pb/afio/pbconf/2.5/pbfilter/rpm.pbf > /tmp/rpm.pbf
     213sudocmd "mv /tmp/all.pbf $PBTEST/pb/afio/pbconf/2.5/pbfilter/all.pbf"
     214sudocmd "chown pbtest:pbtest $PBTEST/pb/afio/pbconf/2.5/pbfilter/all.pbf"
     215
     216grep -vE 'PBGRP|PBLIC' $PBTEST/pb/afio/pbconf/2.5/pbfilter/rpm.pbf > /tmp/rpm.pbf
    168217cat >> /tmp/rpm.pbf << EOF
    169218filter PBGRP = Applications/Archiving
    170219filter PBLIC = Afio
    171220EOF
    172 sudo mv /tmp/rpm.pbf ~pbtest/pb/afio/pbconf/2.5/pbfilter/rpm.pbf
    173 sudo chown pbtest:pbtest ~pbtest/pb/afio/pbconf/2.5/pbfilter/rpm.pbf
     221sudocmd "mv /tmp/rpm.pbf $PBTEST/pb/afio/pbconf/2.5/pbfilter/rpm.pbf"
     222sudocmd "chown pbtest:pbtest $PBTEST/pb/afio/pbconf/2.5/pbfilter/rpm.pbf "
    174223
    175224# First build
    176 sudopbtest "pb -p afio -r 2.5 sbx2build"
    177 
    178 sudo perl -pi -e 's|%configure||' ~pbtest/pb/afio/pbconf/2.5/afio/rpm/afio.spec
    179 sudo perl -pi -e 's|make %{?_smp_mflags}|make %{?_smp_mflags}\nchmod 644 script*/*|' ~pbtest/pb/afio/pbconf/2.5/afio/rpm/afio.spec
    180 sudo perl -pi -e 's|make DESTDIR=.*|mkdir -p $RPM_BUILD_ROOT%{_bindir}\nmkdir -p $RPM_BUILD_ROOT%{_mandir}/man1\ninstall -p -m 755 afio $RPM_BUILD_ROOT%{_bindir}\ninstall -p -m 644 afio.1 $RPM_BUILD_ROOT%{_mandir}/man1|' ~pbtest/pb/afio/pbconf/2.5/afio/rpm/afio.spec
    181 sudo perl -pi -e 's|%doc ChangeLog|%doc HISTORY PORTING README SCRIPTS ANNOUNCE-2.5 perl.artistic.license|' ~pbtest/pb/afio/pbconf/2.5/afio/rpm/afio.spec
    182 sudo perl -pi -e 's|%doc INSTALL COPYING README AUTHORS NEWS|%doc afio.lsm script1 script2 script3 script4\n%{_bindir}/%{name}\n%{_mandir}/man1/%{name}.1*|' ~pbtest/pb/afio/pbconf/2.5/afio/rpm/afio.spec
    183 sudopbtest "pb -p afio sbx2pkg"
    184 rpm -qilvp ~pbtest/pb/afio/build/RPMS/x86_64/afio-2.5*
     225sudopbtest "pb -r 2.5 sbx2build"
     226
     227cat > /tmp/pbtestcmd << EOF
     228# Filtering $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
     229perl -pi -e 's|%configure||' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
     230perl -pi -e 's|make %{\?_smp_mflags}|make %{\?_smp_mflags}\nchmod 644 script*/*|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
     231perl -pi -e 's|mkdir -p %|mkdir -p \$RPM_BUILD_ROOT%|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
     232perl -pi -e 's|make DESTDIR=.*|mkdir -p \$RPM_BUILD_ROOT%{_bindir}\nmkdir -p \$RPM_BUILD_ROOT%{_mandir}/man1\ninstall -p -m 755 afio \$RPM_BUILD_ROOT%{_bindir}\ninstall -p -m 644 afio.1 \$RPM_BUILD_ROOT%{_mandir}/man1|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
     233perl -pi -e 's|%doc ChangeLog|%doc HISTORY PORTING README SCRIPTS ANNOUNCE-2.5 perl.artistic.license|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
     234perl -pi -e 's|%doc INSTALL COPYING README AUTHORS NEWS|%doc afio.lsm script1 script2 script3 script4\n%{_bindir}/%{name}\n%{_mandir}/man1/%{name}.1*|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
     235EOF
     236chmod 755 /tmp/pbtestcmd
     237sudopbtest /tmp/pbtestcmd
    185238
    186239cat > /tmp/pbcl << EOF
     
    192245- First packages created
    193246EOF
    194 sudo mv /tmp/pbcl ~pbtest/pb/afio/pbconf/2.5/afio/pbcl
    195 sudo chown pbtest:pbtest ~pbtest/pb/afio/pbconf/2.5/afio/pbcl
    196 svn add ~pbtest/pb/afio/pbconf/2.5/afio/pbcl
    197 svn ci -m 'Adding pbcl for afio' $VCSOPT
    198 
    199 sudo perl -pi -e 's|,\s*PBDEP||' ~pbtest/pb/afio/pbconf/2.5/afio/deb/control
    200 sudo perl -pi -e 's|Recommends: PBREC||' ~pbtest/pb/afio/pbconf/2.5/afio/deb/control
    201 sudo perl -pi -e 's|Suggests: PBSUG||' ~pbtest/pb/afio/pbconf/2.5/afio/deb/control
     247sudocmd "mv /tmp/pbcl $PBTEST/pb/afio/pbconf/2.5/afio/pbcl"
     248sudocmd "chown pbtest:pbtest $PBTEST/pb/afio/pbconf/2.5/afio/pbcl"
     249sudopbtest "svn add $PBTEST/pb/afio/pbconf/2.5/afio/pbcl"
     250sudopbtest "svn ci -m 'Adding pbcl for afio' $VCSOPT $PBTEST/pb"
     251
     252sudopbtest "pb sbx2pkg"
     253rpm -qilvp $PBTEST/pb/afio/build/RPMS/x86_64/afio-2.5*
     254
     255cat > /tmp/pbtestcmd << EOF
     256# Filtering $PBTEST/pb/afio/pbconf/2.5/afio/deb/control
     257perl -pi -e 's|,\s*PBDEP||' $PBTEST/pb/afio/pbconf/2.5/afio/deb/control
     258perl -pi -e 's|Recommends: PBREC||' $PBTEST/pb/afio/pbconf/2.5/afio/deb/control
     259perl -pi -e 's|Suggests: PBSUG||' $PBTEST/pb/afio/pbconf/2.5/afio/deb/control
     260EOF
     261chmod 755 /tmp/pbtestcmd
     262sudopbtest /tmp/pbtestcmd
     263
    202264cat > /tmp/afio.docs << EOF
    203265HISTORY
     
    213275script4
    214276EOF
    215 sudo mv /tmp/afio.docs ~pbtest/pb/afio/pbconf/2.5/afio/deb/afio.docs
    216 sudo chown pbtest:pbtest ~pbtest/pb/afio/pbconf/2.5/afio/deb/afio.docs
    217 
    218 sudo perl -pi -e 's|config.status: configure|config.status: Makefile|' ~pbtest/pb/afio/pbconf/2.5/afio/deb/rules
    219 sudo perl -pi -e 's|dh_installchangelogs ChangeLog|dh_installchangelogs debian/changelog|' ~pbtest/pb/afio/pbconf/2.5/afio/deb/rules
    220 sudo perl -pi -e 's|$(MAKE) install|mkdir -p $(CURDIR)/debian/$(PACKAGE_NAME)/usr/bin $(CURDIR)/debian/$(PACKAGE_NAME)/usr/share/man/man1|' ~pbtest/pb/afio/pbconf/2.5/afio/deb/rules
    221 sudo perl -pi -e 's|# - copy html manual to temporary location for renaming|install -p -m 755 afio $(CURDIR)/debian/$(PACKAGE_NAME)/usr/bin ; nstall -p -m 644 afio.1 $(CURDIR)/debian/$(PACKAGE_NAME)/usr/share/man/man1|' ~pbtest/pb/afio/pbconf/2.5/afio/deb/rules
    222 sudo sed -i -e '/\.\/configure /d' ~pbtest/pb/afio/pbconf/2.5/afio/deb/rules
     277sudocmd "mv /tmp/afio.docs $PBTEST/pb/afio/pbconf/2.5/afio/deb/afio.docs"
     278sudocmd "chown pbtest:pbtest $PBTEST/pb/afio/pbconf/2.5/afio/deb/afio.docs "
     279
     280cat > /tmp/pbtestcmd << EOF
     281# Filtering $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
     282perl -pi -e 's|config.status: configure|config.status: Makefile|' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
     283perl -pi -e 's|dh_installchangelogs ChangeLog|dh_installchangelogs debian/changelog|' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
     284perl -pi -e 's|\$(MAKE) install|mkdir -p \$(CURDIR)/debian/\$(PACKAGE_NAME)/usr/bin \$(CURDIR)/debian/\$(PACKAGE_NAME)/usr/share/man/man1|' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
     285perl -pi -e 's|# - copy html manual to temporary location for renaming|install -p -m 755 afio \$(CURDIR)/debian/\$(PACKAGE_NAME)/usr/bin ; install -p -m 644 afio.1 \$(CURDIR)/debian/\$(PACKAGE_NAME)/usr/share/man/man1|' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
     286sed -i -e '/\.\/configure /d' $PBTEST/pb/afio/pbconf/2.5/afio/deb/rules
     287EOF
     288chmod 755 /tmp/pbtestcmd
     289sudopbtest /tmp/pbtestcmd
     290
    223291
    224292#dpkg -I ~ftp/pub/afio/test/debian/5.0/afio_2.5-0.20091204131057_i386.deb
    225293#dpkg -x ~ftp/pub/afio/test/debian/5.0/afio_2.5-0.20091204131057_i386.deb /tmp/x ;  ls -lR /tmp/x
    226294
    227 for d in $TESTVEDIST; do
    228     sudopbtest "pb -p pb -r devel -m $d newve"
    229     sudopbtest "pb -p pb -m $d sbx2setupve"
    230     sudopbtest "pb -p pb -m $d snapve"
    231     sudopbtest "pb -p afio -m $d sbx2ve"
    232     # Cleaning VE to use the snapshot
    233     dd=`echo $d | cut -d'-' -f1`
    234     sudo rm -rf ~pbtest/tmp/$dd
    235     sudopbtest "pb -p afio -S -m $d sbx2ve"
    236 done
    237 
    238 sudopbtest "pb -p afio -r 2.5 -V 2.6 newver"
    239 sudopbtest "pb -p afio clean"
    240 
     295sudopbtest "pb getconf"
    241296# test also with pb
     297sudopbtest "pb -p pb -r devel getconf"
    242298sudopbtest "pb -p pb -r devel sbx2pkg"
    243299sudopbtest "pb -p pb build2ssh"
    244300sudopbtest "pb -p pb pkg2ssh"
     301
     302for d in $TESTVEDIST; do
     303    sudopbtest "pb -p pb -m $d newve"
     304    sudopbtest "pb -p pb -m $d sbx2setupve"
     305    sudopbtest "pb -p pb -m $d snapve"
     306    sudopbtest "pb -m $d sbx2ve"
     307    # Cleaning VE to use the snapshot
     308    dd=`echo $d | cut -d'-' -f1`
     309    sudocmd "rm -rf $PBTEST/tmp/$dd"
     310    sudopbtest "pb -S -m $d sbx2ve"
     311done
     312
     313sudopbtest "svn ci --username pbtest --password pbtest -m 'sync before newver' $PBTEST/pb"
     314sudopbtest "pb -r 2.5 -V 2.6 newver"
     315sudopbtest "pb clean"
     316
    245317
    246318
     
    252324#-drive file=/users/qemu/mageia-2-i386.qemu,if=virtio,media=disk \
    253325#-redir tcp:2200:10.0.2.15:22
    254 #sudopbtest "pb -p projtest -m $TESTVMDIST -i $TESTVMISO newvm"
    255 #sudopbtest "pb -p projtest -m $TESTVMDIST sbx2setupvm"
    256 #sudopbtest "pb -p projtest -m $TESTVMDIST sbx2vm"
    257326
    258327# test also with MOndoRescue
     
    260329
    261330# cleanup
    262 sudopbtest "killall svnserve"
    263 
     331sudopbtest "killall svnserve" 1
     332
Note: See TracChangeset for help on using the changeset viewer.