do not run inherit if no build or build-late

blablacar · Apr 12, 2016 · 2d7001c · 2d7001c
1 parent baf2408
commit 2d7001c
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 6 deletions.
diff --git a/aci-builder/files/dgr/builder/stage2/builder.sh b/aci-builder/files/dgr/builder/stage2/builder.sh
@@ -33,7 +33,9 @@ fi
 
 echo "ce9d63a98a8b4438882fd795e294cd50" > /etc/machine-id
 
+mkdir -p /dgr/builder/runlevels
 mkdir -p /dgr/builder/attributes
+
 # save envs
 export | grep -v -E " SHLV=| ROOTFS=| TARGET= | ACI_PATH= | ACI_HOME= | ACI_EXEC=" > /dgr/builder/export
 
@@ -65,8 +67,7 @@ if [ -d ${ACI_HOME}/runlevels/inherit-build-early ]; then
 fi
 
 # build runlevel
-if [ -d ${ACI_HOME}/runlevels/build ] || [ -d ${ROOTFS}/dgr/runlevels/inherit-build-early ]; then
-    mkdir -p /dgr/builder/runlevels
+if [ -d ${ACI_HOME}/runlevels/build ] || [ -d ${ACI_HOME}/runlevels/build-late ]; then
     if [ -d ${ACI_HOME}/runlevels/build ]; then
         cp -Rf ${ACI_HOME}/runlevels/build /dgr/builder/runlevels
     fi
@@ -105,7 +106,7 @@ fi
 
 
 # build-late runlevel
-if [ -d ${ACI_HOME}/runlevels/build-late ] || [ -d ${ROOTFS}/dgr/runlevels/inherit-build-late ]; then
+if [ -d ${ACI_HOME}/runlevels/build ] || [ -d ${ACI_HOME}/runlevels/build-late ]; then
     if [ -d ${ACI_HOME}/runlevels/build-late ]; then
         cp -Rf ${ACI_HOME}/runlevels/build-late /dgr/builder/runlevels
     fi

diff --git a/aci-builder/files/dgr/command/build b/aci-builder/files/dgr/command/build
@@ -8,5 +8,7 @@ execute_files "/dgr/runlevels/inherit-build-early" || onError "Inherit-build-ear
 /dgr/bin/prestart
 execute_files "/dgr/runlevels/inherit-build-late" || onError "Inherit-build-late"
 
+echo_green "\nBuilder is ready\n"
+
 export ACI_HOME="/dgr/aci-home"
 /dgr/builder/stage2/builder.sh
diff --git a/examples/debian/aci-debian-cassandra/runlevels/build/10.install.sh b/examples/debian/aci-debian-cassandra/runlevels/build/10.install.sh
@@ -1,6 +1,7 @@
 #!/dgr/bin/busybox sh
-set -x
 set -e
+. /dgr/bin/functions.sh
+isLevelEnabled "debug" && set -x
 
 cat > /etc/apt/sources.list.d/cassandra.list<<EOF
 deb http://ftp.fr.debian.org/debian/ sid main non-free contrib # needed for java8

diff --git a/examples/debian/aci-debian-cassandra/runlevels/build/20.extract-version.sh b/examples/debian/aci-debian-cassandra/runlevels/build/20.extract-version.sh
@@ -1,4 +1,7 @@
 #!/dgr/bin/busybox sh
+set -e
+. /dgr/bin/functions.sh
+isLevelEnabled "debug" && set -x
 
 export CASSANDRA_VERSION=`dpkg -s cassandra | grep 'Version: ' | cut -d' ' -f 2`
 echo -e "default:\n  version: ${CASSANDRA_VERSION}" > /dgr/builder/attributes/version.yml
diff --git a/examples/debian/aci-debian-cassandra/runlevels/prestart-early/10-seeds.sh b/examples/debian/aci-debian-cassandra/runlevels/prestart-early/10-seeds.sh
@@ -1,6 +1,7 @@
-#!/bin/bash
-set -x
+#!/dgr/bin/busybox sh
 set -e
+. /dgr/bin/functions.sh
+isLevelEnabled "debug" && set -x
 
 cat > /dgr/attributes/aci-cassandra/prestart.yml <<EOF
 default: