Changeset 2204 in ProjectBuilder for devel/pbtest/bin

Timestamp:

Mar 11, 2017, 12:51:24 AM (8 years ago)

Author:

Bruno Cornec

Message:

Munch improved test script for non-regression

File:

• devel/pbtest/bin/pbtest (modified) (16 diffs)

devel/pbtest/bin/pbtest

@@ -12 +12 @@
 
 # You may have multiple distros here
-TESTVEDIST="debian-6.0-x86_64 ubuntu-12.04-i386 fedora-16-x86_64 opensuse-12.1-x86_64 mageia-2-i386 mandriva-2010.1-i386"
+TESTVEDIST="debian-8-x86_64 ubuntu-16.04-x86_64 fedora-25-x86_64 opensuse-42.2-x86_64 mageia-5-x86_64 centos-7-x86_64"
 # Only one VM is tested for now.
 TESTVMDIST="fedora-16-i386"
@@ -44 +44 @@
 
 sudocmd() {
-cmd=$1
+cmd=$*
 
 echo " "
@@ -59 +59 @@
 
 
+# For rpmbootstrap VE
 for d in $TESTVEDIST; do
     # umount /proc in VE in case
@@ -68 +69 @@
     fi
 done
-sudocmd "rm -rf $PBTEST/* $PBTEST/.??*"
-sudocmd "rmdir $PBTEST"
+
+# Cleanup phase
 sudocmd "killall -u $PBUSER"
+sudocmd "rm -rf $PBTEST/"
 sudocmd "userdel $PBUSER"
 #sudocmd "groupdel $PBUSER" 1
 sudocmd "useradd $PBUSER"
+sudocmd "chmod 755 $PBTEST"
 sudocmd "grep -q $PBUSER /etc/sudoers"
 if [ $? -ne 0 ]; then
@@ -88 +91 @@
 $PBUSER ALL=NOPASSWD:/bin/mkdir
 $PBUSER ALL=NOPASSWD:/usr/bin/qemu-kvm
+$PBUSER ALL=NOPASSWD:/usr/bin/docker
 EOF
     sudocmd "cat /etc/sudoers /tmp/sudoers" | grep -v "INFO " > /tmp/sudoers2
@@ -95 +99 @@
     rm -f /tmp/sudoers /tmp/sudoers2
 fi
-# Force $PBUSER (for now pbuser hardcoded!) account passwd is $PBUSER
+# Force $PBUSER (for now pbtest hardcoded!) account passwd is $PBUSER
 sudocmd "perl -pi -e 's|^pbtest:.*|pbtest:$2a$08$2Q.tEty4v/fU0RyPeDelk.AjLAtXUXU3DpSs/l/8YrFmau1LJRCqC:15483:0:99999:7:::|' /etc/shadow"
 sudopbtest "echo export PBPROJ=$PBPROJ >> $PBTEST/.bash_profile"
@@ -129 +133 @@
 sudopbtest "chmod 700 $PBTEST/.ssh"
 
-sudopbtest "pb -h"
+sudopbtest "pb --version"
 sudopbtest "pbdistrocheck"
-sudopbtest "pb clean 2>&1 > /dev/null" 1
 
 cat > /tmp/.pbrc << EOF
@@ -145 +148 @@
 sshdir pb = \$ENV{'HOME'}/ftp
 #
-pbpackager default = Big Chief <bigchief@hp.com>
+pbpackager default = Big Chief <bigchief@project-builder.org>
 vmport pb = 2200
 pbparallel pb = 6
@@ -152 +155 @@
 EOF
 sudocmd "mv /tmp/.pbrc $PBTEST/.pbrc"
+
+sudopbtest "pb -p $PBPROJ clean 2>&1 > /dev/null" 1
 
 cat > /tmp/.pbrc << EOF
@@ -164 +169 @@
 
 cat > /tmp/.pbrc << EOF
-vetype default = chroot
+vetype default = docker
 verpmtype default = rpmbootstrap
 vedebtype default = debootstrap
@@ -178 +183 @@
 sudopbtest "ssh-keygen -f $PBTEST/.ssh/id_rsa -t rsa -b 768 -v -N ''"
 sudopbtest "cp $PBTEST/.ssh/id_rsa.pub $PBTEST/.ssh/authorized_keys"
-sudopbtest "chmod 600 $PBTEST/.ssh/authorized_keys $PBTEST/.ssh/id_rsa.pub"
+sudopbtest "chmod 600 $PBTEST/.ssh/authorized_keys $PBTEST/.ssh/id_rsa"
+sudopbtest "chmod 644 $PBTEST/.ssh/id_rsa.pub"
 sudopbtest "ssh localhost touch $PBTEST/ftp/README"
 
 # Create SVN conf files - doesn't work fully as it asks for a password - solved with PBVCSOPT
-sudopbtest "svn info 2>&1 > /dev/null" 1
 cat > /tmp/servers << EOF
 [global]
@@ -189 +194 @@
 store-auth-creds = yes
 EOF
+sudopbtest "mkdir -p $PBTEST/.subversion"
 sudocmd "mv /tmp/servers $PBTEST/.subversion/servers"
 sudocmd "chown ${PBUSER}:$PBUSER $PBTEST/.subversion/servers"
@@ -199 +205 @@
 sudopbtest "svn add $PBTEST/pb/README"
 sudopbtest "svn ci $VCSOPT -m 'add readme' $PBTEST/pb/README"
-sudopbtest "PBVCSOPT=\"$VCSOPT\" pb -r 2.5 newproj afio"
+sudopbtest "svn info $PBTEST/pb 2>&1 > /dev/null" 1
+sudopbtest "PBVCSOPT=\"$VCSOPT\" pb -p $PBPROJ -r 2.5 newproj afio"
 
 grep -vE '^defpkgdir|^projver|^projtag|^pburl|^pbrepo|^shh' $PBTEST/pb/afio/pbconf/2.5/afio.pb > /tmp/afio.pb
@@ -249 +256 @@
 
 # First build
-sudopbtest "pb -r 2.5 sbx2build"
+sudopbtest "pb -p $PBPROJ -r 2.5 sbx2build"
 
 cat > /tmp/pbtestcmd << EOF
@@ -276 +283 @@
 sudopbtest "svn ci -m 'Adding pbcl for afio' $VCSOPT $PBTEST/pb"
 
-sudopbtest "pb sbx2pkg"
-rpm -qilvp $PBTEST/pb/afio/pbbuild/RPMS/x86_64/afio-2.5*
+sudopbtest "pb -p afio -r 2.5 sbx2pkg"
+sudopbtest "rpm -qilvp $PBTEST/pb/afio/pbbuild/RPMS/x86_64/afio-2.5*"
 
 cat > /tmp/pbtestcmd << EOF
@@ -315 +322 @@
 sudopbtest /tmp/pbtestcmd
 
-
 #dpkg -I ~ftp/pub/afio/test/debian/5.0/afio_2.5-0.20091204131057_i386.deb
 #dpkg -x ~ftp/pub/afio/test/debian/5.0/afio_2.5-0.20091204131057_i386.deb /tmp/x ;  ls -lR /tmp/x
 
-sudopbtest "pb getconf"
+# need to be part of docker group for Docker
+sudocmd "grep -Eq '^docker:' /etc/group" | grep $PBUSER
+if [ $? -ne 0 ]; then
+    sudocmd usermod $PBUSER -G docker
+fi
+
+for d in $TESTVEDIST; do
+    dd=`echo $d | cut -d'-' -f1`
+    vv=`echo $d | cut -d'-' -f2`
+    aa=`echo $d | cut -d'-' -f3`
+    #sudopbtest "PATH=${PATH}:/sbin:/usr/sbin pb -p pb -T docker -m $d -i ${dd}:$vv newve"
+    #sudopbtest "pb -p pb -m $d -T docker sbx2setupve"
+    #sudopbtest "pb -p pb -m $d snapve"
+    sudopbtest "pb -p $PBPROJ -r 2.5 -m $d sbx2prepve"
+    sudopbtest "pb -p $PBPROJ -r 2.5 -m $d sbx2ve"
+    # Cleaning VE to use the snapshot
+    #dd=`echo $d | cut -d'-' -f1`
+    #vv=`echo $d | cut -d'-' -f2`
+    #aa=`echo $d | cut -d'-' -f3`
+    #if [ -f "$PBTEST/ve/$dd/$vv/$aa/proc/cpuinfo" ]; then
+        #sudocmd "umount $PBTEST/ve/$dd/$vv/$aa/proc"
+    #fi
+    #sudocmd "rm -rf $PBTEST/ve/$dd/$vv/$aa"
+    #sudopbtest "pb -S -m $d sbx2ve"
+done
+
+sudopbtest "svn ci $VCSOPT -m 'sync before newver' $PBTEST/pb"
+sudopbtest "PBVCSOPT=\"$VCSOPT\" pb -p $PBPROJ -r 2.5 -V 2.6 newver"
+# We now need to adapt tar file,log ... to a 2.6 content
+#sudopbtest "pb -p $PBPROJ -r 2.6 sbx2pkg"
+
+# need to be part of group video for KVM
+sudocmd "grep -Eq '^video:' /etc/group" | grep $PBUSER
+if [ $? -ne 0 ]; then
+    sudocmd usermod $PBUSER -G video
+fi
+
+sudopbtest "pb -p $PBPROJ getconf pburl"
 # test also with pb
-sudopbtest "pb -p pb -r devel getconf"
+sudopbtest "pb -p pb -r devel getconf pburl"
 sudopbtest "pb -p pb -r devel sbx2pkg"
 sudopbtest "pb -p pb build2ssh"
 sudopbtest "pb -p pb pkg2ssh"
 
-for d in $TESTVEDIST; do
-    sudopbtest "PATH=${PATH}:/sbin:/usr/sbin pb -p pb -m $d newve"
-    sudopbtest "pb -p pb -m $d sbx2setupve"
-    sudopbtest "pb -p pb -m $d snapve"
-    sudopbtest "pb -m $d sbx2ve"
-    # Cleaning VE to use the snapshot
-    dd=`echo $d | cut -d'-' -f1`
-    vv=`echo $d | cut -d'-' -f2`
-    aa=`echo $d | cut -d'-' -f3`
-    if [ -f "$PBTEST/ve/$dd/$vv/$aa/proc/cpuinfo" ]; then
-        sudocmd "umount $PBTEST/ve/$dd/$vv/$aa/proc"
-    fi
-    sudocmd "rm -rf $PBTEST/ve/$dd/$vv/$aa"
-    sudopbtest "pb -S -m $d sbx2ve"
-done
-
-sudopbtest "svn ci $VCSOPT -m 'sync before newver' $PBTEST/pb"
-sudopbtest "PBVCSOPT=\"$VCSOPT\" pb -r 2.5 -V 2.6 newver"
-# We now need to adapt tar file,log ... to a 2.6 content
-#sudopbtest "pb -r 2.6 sbx2pkg"
-
-# need tobe part of group video for KVM
-sudocmd "grep -Eq '^video:' /etc/group" | grep $PBUSER
-if [ $? -ne 0 ]; then
-    sudocmd "perl -pi -e 's|^(video:.*)$|$1,$ENV{'PBUSER'}|' /etc/shadow"
-fi
-d=mageia-2-i386
-sudopbtest "qemu-img create -f qcow2 $PBTEST/vm/$d.qemu 72G"
-sudopbtest "sudo qemu-kvm -m 1024 -kernel /pub/mageia/distrib/2/i586/isolinux/alt0/vmlinuz -initrd /pub/mageia/distrib/2/i586/isolinux/alt0/all.rdz -append "ramdisk_size=128000 root=/dev/ram3 kickstart=http://192.168.8.55/pub/ks/guerrero/ks.pl automatic=method:http,server:192.168.8.55,directory:/pub/mageia/distrib/2/i586,network:dhcp" -drive file=$PBTEST/vm/$d.qemu,if=virtio,media=disk -boot once=n -redir tcp:2200:10.0.2.15:22"
+d=mageia-5-i386
+sudopbtest "qemu-img create -f qcow2 $PBTEST/vm/$d.qemu 30G"
+sudopbtest "qemu-kvm -m 1024 -kernel /pub/mageia/distrib/5/i586/isolinux/i386/vmlinuz -initrd /pub/mageia/distrib/5/i586/isolinux/i386/all.rdz -append "ramdisk_size=128000 root=/dev/ram3 kickstart=http://192.168.8.2/pub/ks/guerrero/ks.pl automatic=method:http,server:192.168.8.2,directory:/pub/mageia/distrib/5/i586,network:dhcp" -drive file=$PBTEST/vm/$d.qemu,if=virtio,media=disk -boot once=n -redir tcp:2200:10.0.2.15:22"
 sudopbtest "pb -p pb -r devel -m $d sbx2setupvm"
 sudopbtest "pb -p pb -m $d snapvm"
-sudopbtest "pb -m $d sbx2vm"
+sudopbtest "pb -p pb -m $d sbx2vm"
 
 # test also with MondoRescue
-pb -p mondorescue -r branches/3.0 cms2pkg
+#sudopbtest b -p mondorescue -r branches/3.3 cms2pkg
 
 # cleanup
-sudopbtest "pb clean"
+sudopbtest "pb -p $PBPROJ clean"
 sudopbtest "killall svnserve" 1
 exit