Changeset 2252 in ProjectBuilder for devel/pbtest

Timestamp:

Aug 30, 2017, 5:07:32 PM (7 years ago)

Author:

Bruno Cornec

Message:

Use .pbrc.yml now as a YAML file as well instead of .pbrc

File:

• devel/pbtest/bin/pbtest (modified) (1 diff)

devel/pbtest/bin/pbtest

@@ -136 +136 @@
 sudopbtest "pbdistrocheck"
 
-cat > /tmp/.pbrc << EOF
+cat > /tmp/.pbrc.yml << EOF
 # Projects
-pbconfurl afio = svn://localhost/pb/afio/pbconf
-pbdefdir default = \$ENV{'HOME'}/pb
-pbconfurl pb = svn://svn.project-builder.org/pb/pbconf
-pbconfdir pb = \$ENV{'HOME'}/pb/pbconf
-pburl pb = svn://svn.project-builder.org/pb
-pburl mondorescue = svn://svn.mondorescue.org/mondorescue/branches
-sshhost pb = localhost
-sshlogin pb = $PBUSER
-sshdir pb = \$ENV{'HOME'}/ftp
+  pbconfurl:
+    afio : svn://localhost/pb/afio/pbconf
+  pbdefdir:
+    default : \$ENV{'HOME'}/pb
+  pbconfurl:
+    pb : svn://svn.project-builder.org/pb/pbconf
+  pbconfdir:
+    pb : \$ENV{'HOME'}/pb/pbconf
+  pburl:
+    pb : svn://svn.project-builder.org/pb
+  pburl:
+    mondorescue : svn://svn.mondorescue.org/mondorescue/branches
+  sshhost:
+    pb : localhost
+  sshlogin:
+    pb : $PBUSER
+  sshdir:
+    pb : \$ENV{'HOME'}/ftp
 #
-pbpackager default = Big Chief <bigchief@project-builder.org>
-vmport pb = 2200
-pbparallel pb = 6
-vepath default = $PBTEST/ve
-vmpath default = $PBTEST/vm
-EOF
-sudocmd "mv /tmp/.pbrc $PBTEST/.pbrc"
+  pbpackager:
+    default : Big Chief <bigchief@project-builder.org>
+  vmport:
+    pb : 2200
+  pbparallel:
+    pb : 6
+  vepath:
+    default : $PBTEST/ve
+  vmpath:
+    default : $PBTEST/vm
+EOF
+sudocmd "mv /tmp/.pbrc.yml $PBTEST/.pbrc.yml"
 
 sudopbtest "pb -p $PBPROJ clean 2>&1 > /dev/null" 1
 
-cat > /tmp/.pbrc << EOF
-vmtype default = kvm
-vmcmd default = qemu-kvm
-vmsize fedora = 10G
-vmmonport default = 4000
-vmlogin default = $PBUSER
-EOF
-echo "vmlist default = `echo $TESTVMDIST | sed 's/ /,/g'`" >> /tmp/.pbrc
-sudocmd "mv /tmp/.pbrc $PBTEST/vm/.pbrc"
-
-cat > /tmp/.pbrc << EOF
-vetype default = docker
-verpmtype default = rpmbootstrap
-vedebtype default = debootstrap
-verebuild default = false
-veopt default = 
-vesnap default = false
-velogin default = $PBUSER
-EOF
-echo "velist default = `echo $TESTVEDIST | sed 's/ /,/g'`" >> /tmp/.pbrc
-sudocmd "mv /tmp/.pbrc $PBTEST/ve/.pbrc"
-sudocmd "chown ${PBUSER}:$PBUSER $PBTEST/.pbrc $PBTEST/ve/.pbrc $PBTEST/vm/.pbrc"
+cat > /tmp/.pbrc.yml << EOF
+  vmtype:
+    default : kvm
+  vmcmd:
+    default : qemu-kvm
+  vmsize:
+    fedora : 10G
+  vmmonport:
+    default : 4000
+  vmlogin:
+    default : $PBUSER
+EOF
+echo "  vmlist:" >> /tmp/.pbrc.yml
+echo "    default: `echo $TESTVMDIST | sed 's/ /,/g'`" >> /tmp/.pbrc.yml
+sudocmd "mv /tmp/.pbrc.yml $PBTEST/vm/.pbrc.yml"
+
+cat > /tmp/.pbrc.yml << EOF
+  vetype:
+    default : docker
+  verpmtype:
+    default : rpmbootstrap
+  vedebtype:
+    default : debootstrap
+  verebuild:
+    default : false
+  veopt:
+    default : 
+  vesnap:
+    default : false
+  velogin:
+    default : $PBUSER
+EOF
+echo "  velist:" >> /tmp/.pbrc.yml
+echo "    default: `echo $TESTVEDIST | sed 's/ /,/g'`" >> /tmp/.pbrc.yml
+sudocmd "mv /tmp/.pbrc.yml $PBTEST/ve/.pbrc.yml"
+sudocmd "chown ${PBUSER}:$PBUSER $PBTEST/.pbrc.yml $PBTEST/ve/.pbrc.yml $PBTEST/vm/.pbrc.yml"
 
 sudopbtest "ssh-keygen -f $PBTEST/.ssh/id_rsa -t rsa -b 768 -v -N ''"