Changeset 2369 in ProjectBuilder for devel/contrib/mkctn

Timestamp:

Feb 28, 2019, 2:11:07 AM (5 years ago)

Author:

Bruno Cornec

Message:

better automatic tests with docker for pb

File:

• devel/contrib/mkctn (modified) (1 diff)

devel/contrib/mkctn

@@ -4 +4 @@
 DISTROVER=$2
 ORIGREPO=$3
+ARCH=x86_64
 
-M=$DISTRO-$DISTROVER-x86_64
+M=$DISTRO-$DISTROVER-$ARCH
 
-if [ _"$ORIGREPO" != _"" ]; then
-    DISTRO=$ORIGREPO
+if [ _"$DISTRO" = _"mageia" ]; then
+    ORIGREPO=mageiaofficial
+    DISTROVER=${DISTROVER}-$ARCH
+elif [ _"$DISTRO" = _"opensuse" ]; then
+    vm=`echo $DISTROVER | cut -d . -f1`
+    if [ $vm -ge 15 ] && [ $vm -lt 42 ]; then 
+        ORIGREPO=opensuse/leap
+    fi
+else
+    ORIGREPO="$DISTRO"
 fi
 
-echo "Working on ${DISTRO}:$DISTROVER ..."
+echo "Working on $M ..."
 echo "-----------------------------------"
-docker pull ${DISTRO}:$DISTROVER && \
-pb -p pb -T docker -m $M newve -i ${DISTRO}:$DISTROVER && \
-pb -p pb -T docker -m $M sbx2setupve && \
-pb -p pb -T docker -m $M prepve && \
-pb -p pb -T docker -m $M build2ve
+if [ _"$DISTRO" != _"mageia" ]; then
+    docker pull ${ORIGREPO}:$DISTROVER
+fi
+pb -p pb -T docker --stop-on-error -m $M newve -i ${ORIGREPO}:$DISTROVER && \
+pb -p pb -T docker --stop-on-error -m $M sbx2setupve && \
+pb -p pb -T docker --stop-on-error -m $M prepve && \
+pb -p pb -T docker --stop-on-error -m $M build2ve
 docker image prune -f