Changeset 1590

Timestamp:

05/24/12 01:05:04 (13 months ago)

Author:

bruno

Message:

• more pbtest content passes now. We're building the VE and afio locally at least!

File:

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

devel/pb/t/pbtest

@@ -31 +31 @@
     echo "INFO (as pbtest): Now running $cmd [$msg]"
 fi
-sudo su - pbtest -c "$cmd"
+sudo -n su - pbtest -c "$cmd"
 ret=$?
 if [ $ret -ne 0 ] && [ _"$msg" == _"" ]; then
@@ -45 +45 @@
 
 echo "INFO (as root): Now running $cmd"
-sudo $cmd
+sudo -n $cmd
 ret=$?
 if [ $ret -ne 0 ]; then
@@ -65 +65 @@
     cat > /tmp/sudoers << EOF
 Defaults env_keep += "PBPROJ"
-pbtest localhost=NOPASSWD:/usr/sbin/chroot
-pbtest localhost=NOPASSWD:/usr/bin/rpmbootstrap
-pbtest localhost=NOPASSWD:/bin/cp
+# This is for the pbtest account in the VE only
+pbtest ALL=NOPASSWD:/usr/sbin/chroot
+pbtest ALL=NOPASSWD:/usr/bin/rpmbootstrap
+pbtest ALL=NOPASSWD:/usr/sbin/debootstrap
+pbtest ALL=NOPASSWD:/bin/chmod
+pbtest ALL=NOPASSWD:/bin/cp
+pbtest ALL=NOPASSWD:/bin/rm
+pbtest ALL=NOPASSWD:/bin/tar
+pbtest ALL=NOPASSWD:/bin/mkdir
 EOF
     sudocmd "cat /etc/sudoers /tmp/sudoers > /tmp/sudoers2"
@@ -181 +187 @@
 sudopbtest "touch $PBTEST/pb/README"
 sudopbtest "svn add $PBTEST/pb/README"
-sudopbtest "svn ci --username pbtest --password pbtest -m 'add readme' $PBTEST/pb/README"
+sudopbtest "svn ci $VCSOPT -m 'add readme' $PBTEST/pb/README"
 sudopbtest "PBVCSOPT=\"$VCSOPT\" pb -r 2.5 newproj afio"
 
@@ -229 +235 @@
 perl -pi -e 's|%configure||' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
 perl -pi -e 's|make %{\?_smp_mflags}|make %{\?_smp_mflags}\nchmod 644 script*/*|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
-perl -pi -e 's|mkdir -p %|mkdir -p \$RPM_BUILD_ROOT%|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
-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
+perl -pi -e 's|make DESTDIR=.*|mkdir -p %{buildroot}%{_bindir}\nmkdir -p %{buildroot}%{_mandir}/man1\ninstall -p -m 755 afio %{buildroot}%{_bindir}\ninstall -p -m 644 afio.1 %{buildroot}%{_mandir}/man1|' $PBTEST/pb/afio/pbconf/2.5/afio/rpm/afio.spec
 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
 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
@@ -311 +316 @@
 done
 
-sudopbtest "svn ci --username pbtest --password pbtest -m 'sync before newver' $PBTEST/pb"
-sudopbtest "pb -r 2.5 -V 2.6 newver"
+sudopbtest "svn ci $VCSOPT -m 'sync before newver' $PBTEST/pb"
+sudopbtest "PBVCSOPT=\"$VCSOPT\" pb -r 2.5 -V 2.6 newver"
 sudopbtest "pb clean"