Changeset 1577

Timestamp:

05/23/12 14:33:44 (13 months ago)

Author:

bruno

Message:

Adding pbcl for afio

File:

• devel/pb/t/pbtest (modified) (14 diffs)

devel/pb/t/pbtest

@@ -23 +23 @@
 sudo grep -q pbtest /etc/sudoers
 if [ $? -ne 0 ]; then
-    cat >> /tmp/sudoers << EOF
+    cat > /tmp/sudoers << EOF
 pbtest localhost=NOPASSWD:/usr/sbin/chroot
 pbtest localhost=NOPASSWD:/bin/cp
@@ -40 +40 @@
 # SVN repo setup
 sudo su - pbtest -c "svnadmin create $PBTEST/svn"
-cat >> /tmp/authz << EOF
+cat > /tmp/authz << EOF
 [/]
 pbtest = rw
@@ -46 +46 @@
 EOF
 sudo mv /tmp/authz ~pbtest/svn/conf/authz
-cat >> /tmp/passwd << EOF
+cat > /tmp/passwd << EOF
 [users]
 pbtest = pbtest
@@ -67 +67 @@
 sudo su - pbtest -c "pbdistrocheck"
 sudo su - pbtest -c "pb clean"
+sudo su - pbtest -c "pb -p afio getconf"
+
 cat > /tmp/.pbrc << EOF
 # Projects
@@ -108 +110 @@
 sudo su - pbtest -c "ssh localhost touch ftp/README"
 
-# Create SVN conf files
+# Create SVN conf files - doesn't work fully as it asks for a password - solved with PBVCSOPT
 sudo su - pbtest -c "svn info"
 cat > /tmp/servers << EOF
@@ -119 +121 @@
 sudo chown pbtest:pbtest ~pbtest/.subversion/servers
 
-sudo su - pbtest -c "svn import pb svn://localhost/pb -m 'Initial creation of pb repo' --username pbtest --password pbtest"
+VCSOPT='--username pbtest --password pbtest'
+
+sudo su - pbtest -c "svn import pb svn://localhost/pb -m 'Initial creation of pb repo' $VCSOPT"
 sudo su - pbtest -c "cd pb ; svn co svn://localhost/pb ."
 sudo su - pbtest -c "cd pb ; touch README ; svn add README ; svn ci --username pbtest --password pbtest -m 'add readme' README"
-sudo su - pbtest -c "export PBVCSOPT='--username pbtest --password pbtest' ; pb -p afio newproj afio"
+sudo su - pbtest -c "export PBVCSOPT=\'$VCSOPT\' ; pb -p afio -r 2.5 newproj afio"
+
+grep -vE '^defpkgdir|^projver|^projtag|^pburl|^pbrepo|^shh' ~pbtest/pb/afio/pbconf/afio.pb > /tmp/afio.pb
 cat >> /tmp/afio.pb << EOF
 defpkgdir afio = dummy
@@ -135 +141 @@
 sudo mv /tmp/afio.pb ~pbtest/pb/afio/pbconf/afio.pb
 sudo chown pbtest:pbtest ~pbtest/pb/afio/pbconf/afio.pb
-sudo su - pbtest -c "pb -p afio sbx2build"
-
+
+grep -vE 'PBSRC|PBDESC|PBSUMMARY|PBURL|PBLOG' ~pbtest/pb/afio/pbconf/pbfilter/all.pbf > /tmp/all.pbf
 cat >> /tmp/all.pbf << EOF
 filter PBSRC = src/%{name}-%{version}.tar.gz
@@ -146 +152 @@
 sudo mv /tmp/all.pbf ~pbtest/pb/afio/pbconf/pbfilter/all.pbf
 sudo chown pbtest:pbtest ~pbtest/pb/afio/pbconf/pbfilter/all.pbf
+
+grep -vE 'PBGRP|PBLIC' ~pbtest/pb/afio/pbconf/pbfilter/rpm.pbf > /tmp/rpm.pbf
 cat >> /tmp/rpm.pbf << EOF
 filter PBGRP = Applications/Archiving
@@ -152 +160 @@
 sudo mv /tmp/rpm.pbf ~pbtest/pb/afio/pbconf/pbfilter/rpm.pbf
 sudo chown pbtest:pbtest ~pbtest/pb/afio/pbconf/pbfilter/rpm.pbf 
+
+# First build
 sudo su - pbtest -c "pb -p afio sbx2build"
 
@@ -166 +176 @@
 sudo su - pbtest -c "pb -p pb pkg2ssh"
 
-cat >> /tmp/pbcl << EOF
+cat > /tmp/pbcl << EOF
 # $Id$
 
@@ -177 +187 @@
 chown pbtest:pbtest ~pbtest/pb/afio/pbconf/afio/pbcl
 svn add ~pbtest/pb/afio/pbconf/afio/pbcl
-svn ci -m 'Adding pbcl for afio'
+svn ci -m 'Adding pbcl for afio' $VCSOPT
 
 sudo perl -pi -e 's|,\s*PBDEP||' ~pbtest/pb/afio/pbconf/afio/deb/control
@@ -207 +217 @@
 #dpkg -x ~ftp/pub/afio/test/debian/5.0/afio_2.5-0.20091204131057_i386.deb /tmp/x ;  ls -lR /tmp/x
 
-sudo su - pbtest -c "pb -p afio getconf"
-
 for d in $TESTVEDIST; do
-    sudo su - pbtest -c "pb -p afio -m $d newve"
+    sudo su - pbtest -c "pb -p pb -m $d newve"
     sudo su - pbtest -c "pb -p pb -m $d sbx2setupve"
-    sudo su - pbtest -c "pb -p afio -m $d snapve"
+    sudo su - pbtest -c "pb -p pb -m $d snapve"
     sudo su - pbtest -c "pb -p afio -m $d sbx2ve"
     # Cleaning VE to use the snapshot
@@ -220 +228 @@
 done
 
-# test also with MOndoRescue
-pb -p mondorescue -r branches/3.0 cms2pkg
 
 #qemu-kvm \
@@ -237 +243 @@
 sudo su - pbtest -c "pb -p afio clean"
 
+# test also with MOndoRescue
+pb -p mondorescue -r branches/3.0 cms2pkg
+
 # Cleanup
 #sudo userdel pbtest