Changeset 2369 in ProjectBuilder for devel/contrib


Ignore:
Timestamp:
Feb 28, 2019, 2:11:07 AM (6 years ago)
Author:
Bruno Cornec
Message:

better automatic tests with docker for pb

Location:
devel/contrib
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • devel/contrib/mkallctn

    r2358 r2369  
    33vedir=`grep -2 vepath ~/.pbrc.yml | grep default: | cut -d: -f2`
    44distros=`grep -2 velist $vedir/.pbrc.yml | grep default: | cut -d: -f2`
     5lwd=`dirname $0`
    56
    67for pbos in `echo $distros | sed 's/,/ /g'`;
    … …  
    89    d=`echo $pbos | cut -d'-' -f1`
    910    v=`echo $pbos | cut -d'-' -f2`
    10     # Check status to see whether we shodl go further
    11     if [ _"$d" = _"mageia" ]; then
    12         /users/bruno/svn-git/pb/devel/contrib/mkctn $d $v mageiaofficial
    13     elif [ _"$d" = _"opensuse" ]; then
    14         vm=`echo $v | cut -d . -f1`
    15         if [ $vm -ge 15 ] && [ $vm -lt 42 ]; then
    16             /users/bruno/svn-git/pb/devel/contrib/mkctn $d $v opensuse/leap
    17         fi
    18     else
    19         /users/bruno/svn-git/pb/devel/contrib/mkctn $d $v
    20     fi
     11    $lwd/mkctn $d $v
    2112done

  • devel/contrib/mkctn

    r2359 r2369  
    44DISTROVER=$2
    55ORIGREPO=$3
     6ARCH=x86_64
    67
    7 M=$DISTRO-$DISTROVER-x86_64
     8M=$DISTRO-$DISTROVER-$ARCH
    89
    9 if [ _"$ORIGREPO" != _"" ]; then
    10     DISTRO=$ORIGREPO
     10if [ _"$DISTRO" = _"mageia" ]; then
     11    ORIGREPO=mageiaofficial
     12    DISTROVER=${DISTROVER}-$ARCH
     13elif [ _"$DISTRO" = _"opensuse" ]; then
     14    vm=`echo $DISTROVER | cut -d . -f1`
     15    if [ $vm -ge 15 ] && [ $vm -lt 42 ]; then
     16        ORIGREPO=opensuse/leap
     17    fi
     18else
     19    ORIGREPO="$DISTRO"
    1120fi
    1221
    13 echo "Working on ${DISTRO}:$DISTROVER ..."
     22echo "Working on $M ..."
    1423echo "-----------------------------------"
    15 docker pull ${DISTRO}:$DISTROVER && \
    16 pb -p pb -T docker -m $M newve -i ${DISTRO}:$DISTROVER && \
    17 pb -p pb -T docker -m $M sbx2setupve && \
    18 pb -p pb -T docker -m $M prepve && \
    19 pb -p pb -T docker -m $M build2ve
     24if [ _"$DISTRO" != _"mageia" ]; then
     25    docker pull ${ORIGREPO}:$DISTROVER
     26fi
     27pb -p pb -T docker --stop-on-error -m $M newve -i ${ORIGREPO}:$DISTROVER && \
     28pb -p pb -T docker --stop-on-error -m $M sbx2setupve && \
     29pb -p pb -T docker --stop-on-error -m $M prepve && \
     30pb -p pb -T docker --stop-on-error -m $M build2ve
    2031docker image prune -f
    2132
Note: See TracChangeset for help on using the changeset viewer.