Changeset 1580

Timestamp:

05/23/12 15:50:06 (12 months ago)

Author:

bruno

Message:

Adding pbcl for afio

File:

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

devel/pb/t/pbtest

@@ -39 +39 @@
 #Taken from Lab document originally
 # SVN repo setup
-sudo su - pbtest -c "svnadmin create $PBTEST/svn"
+sudopbtest "svnadmin create $PBTEST/svn"
 cat > /tmp/authz << EOF
 [/]
@@ -61 +61 @@
 sudo mv /tmp/svnserve.conf ~pbtest/svn/conf/svnserve.conf
 sudo chown pbtest:pbtest ~pbtest/svn/conf/authz ~pbtest/svn/conf/passwd ~pbtest/svn/conf/svnserve.conf
-sudo su - pbtest -c "killall svnserve ; svnserve -d -r ~pbtest/svn"
-sudo su - pbtest -c "mkdir pb ftp ve .ssh; chmod 700 .ssh"
-
-sudo su - pbtest -c "pb --version"
-sudo su - pbtest -c "pbdistrocheck"
-sudo su - pbtest -c "pb clean"
-sudo su - pbtest -c "pb -p afio getconf"
+sudopbtest "killall svnserve ; svnserve -d -r ~pbtest/svn"
+sudopbtest "mkdir pb ftp ve .ssh; chmod 700 .ssh"
+
+sudopbtest "pb --version"
+sudopbtest "pbdistrocheck"
+sudopbtest "pb clean"
+sudopbtest "pb -p afio getconf"
 
 cat > /tmp/.pbrc << EOF
@@ -76 +76 @@
 pbconfdir projtest = \$ENV{'HOME'}/projtest/pbconf
 pburl projtest = svn+ssh://svn.project-builder.org/svn/pb
-pbconfurl pb = svn+ssh://svn.project-builder.org/svn/pb/pbconf
+pbconfurl pb = svn://svn.project-builder.org/pb/pbconf
 pbconfdir pb = \$ENV{'HOME'}/pb/pbconf
-pburl pb = svn+ssh://svn.project-builder.org/svn/pb
+pburl pb = svn://svn.project-builder.org/pb
 pburl mondorescue = svn://svn.mondorescue.org/mondorescue/branches
 #
@@ -106 +106 @@
 sudo chown pbtest:pbtest ~pbtest/.pbrc ~pbtest/ve/.pbrc
 
-sudo su - pbtest -c "ssh-keygen -f .ssh/id_rsa -t rsa -b 768 -v -N ''"
-sudo su - pbtest -c "cp .ssh/id_rsa.pub .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys ; chmod 600 .ssh/id_rsa.pub"
-sudo su - pbtest -c "ssh localhost touch ftp/README"
+sudopbtest "ssh-keygen -f .ssh/id_rsa -t rsa -b 768 -v -N ''"
+sudopbtest "cp .ssh/id_rsa.pub .ssh/authorized_keys ; chmod 600 .ssh/authorized_keys ; chmod 600 .ssh/id_rsa.pub"
+sudopbtest "ssh localhost touch ftp/README"
 
 # Create SVN conf files - doesn't work fully as it asks for a password - solved with PBVCSOPT
-sudo su - pbtest -c "svn info"
+sudopbtest "svn info"
 cat > /tmp/servers << EOF
 [global]
@@ -123 +123 @@
 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=\"$VCSOPT\" ; pb -p afio -r 2.5 newproj afio"
+sudopbtest "svn import pb svn://localhost/pb -m 'Initial creation of pb repo' $VCSOPT"
+sudopbtest "cd pb ; svn co svn://localhost/pb ."
+sudopbtest "cd pb ; touch README ; svn add README ; svn ci --username pbtest --password pbtest -m 'add readme' README"
+sudopbtest "export PBVCSOPT=\"$VCSOPT\" ; pb -p afio -r 2.5 newproj afio"
 
 grep -vE '^defpkgdir|^projver|^projtag|^pburl|^pbrepo|^shh' ~pbtest/pb/afio/pbconf/2.5/afio.pb > /tmp/afio.pb
@@ -140 +140 @@
 EOF
 sudo mv /tmp/afio.pb ~pbtest/pb/afio/pbconf/2.5/afio.pb
+sudo perl -pi -e 's|testver afio = true|testver afio = false|' ~pbtest/pb/afio/pbconf/2.5/afio.pb
 sudo chown pbtest:pbtest ~pbtest/pb/afio/pbconf/2.5/afio.pb
 
@@ -162 +163 @@
 
 # First build
-sudo su - pbtest -c "pb -p afio -r 2.5 sbx2build"
+sudopbtest "pb -p afio -r 2.5 sbx2build"
 
 sudo perl -pi -e 's|%configure||' ~pbtest/pb/afio/pbconf/2.5/afio/rpm/afio.spec
@@ -169 +170 @@
 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
 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
-sudo su - pbtest -c "pb -p afio sbx2pkg"
+sudopbtest "pb -p afio sbx2pkg"
 rpm -qilvp ~pbtest/pb/afio/build/RPMS/x86_64/afio-2.5*
-
-sudo su - pbtest -c "pb -p pb sbx2pkg"
-sudo su - pbtest -c "pb -p pb build2ssh"
-sudo su - pbtest -c "pb -p pb pkg2ssh"
 
 cat > /tmp/pbcl << EOF
@@ -185 +182 @@
 EOF
 sudo mv /tmp/pbcl ~pbtest/pb/afio/pbconf/2.5/afio/pbcl
-chown pbtest:pbtest ~pbtest/pb/afio/pbconf/2.5/afio/pbcl
+sudo chown pbtest:pbtest ~pbtest/pb/afio/pbconf/2.5/afio/pbcl
 svn add ~pbtest/pb/afio/pbconf/2.5/afio/pbcl
 svn ci -m 'Adding pbcl for afio' $VCSOPT
@@ -218 +215 @@
 
 for d in $TESTVEDIST; do
-    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 pb -m $d snapve"
-    sudo su - pbtest -c "pb -p afio -m $d sbx2ve"
+    sudopbtest "pb -p pb -m $d newve"
+    sudopbtest "pb -p pb -m $d sbx2setupve"
+    sudopbtest "pb -p pb -m $d snapve"
+    sudopbtest "pb -p afio -m $d sbx2ve"
     # Cleaning VE to use the snapshot
     dd=`echo $d | cut -d'-' -f1`
     sudo rm -rf ~pbtest/tmp/$dd
-    sudo su - pbtest -c "pb -p afio -S -m $d sbx2ve"
+    sudopbtest "pb -p afio -S -m $d sbx2ve"
 done
+
+sudopbtest "pb -p afio -r 2.5 -V 2.6 newver"
+sudopbtest "pb -p afio clean"
+
+# test also with pb
+sudopbtest "pb -p pb -r devel sbx2pkg"
+sudopbtest "pb -p pb build2ssh"
+sudopbtest "pb -p pb pkg2ssh"
 
 
@@ -236 +241 @@
 #-drive file=/users/qemu/mageia-2-i386.qemu,if=virtio,media=disk \
 #-redir tcp:2200:10.0.2.15:22
-#sudo su - pbtest -c "pb -p projtest -m $TESTVMDIST -i $TESTVMISO newvm"
-#sudo su - pbtest -c "pb -p projtest -m $TESTVMDIST sbx2setupvm"
-#sudo su - pbtest -c "pb -p projtest -m $TESTVMDIST sbx2vm"
-
-sudo su - pbtest -c "pb -p afio -r 1.0 -V 2.0 newver"
-sudo su - pbtest -c "pb -p afio clean"
+#sudopbtest "pb -p projtest -m $TESTVMDIST -i $TESTVMISO newvm"
+#sudopbtest "pb -p projtest -m $TESTVMDIST sbx2setupvm"
+#sudopbtest "pb -p projtest -m $TESTVMDIST sbx2vm"
 
 # test also with MOndoRescue
 pb -p mondorescue -r branches/3.0 cms2pkg
 
-# Cleanup
-#sudo userdel pbtest
+# cleanup
+sudopbtest "killall svnserve"
+
+sudopbtest() {
+
+cmd=$1
+
+echo "INFO pbtest: Now running $cmd"
+sudo su - pbtest -c "$cmd"
+}
+