overlay/Linux/usr/local/src/ansible_gentooimgr

Makefile

@@ -47,17 +47,19 @@ lint::
 build:: build_base
 	sudo $(MAKE) -$(MAKEFLAGS) build_overlay
 
-build_base::
-	echo $@ "${BOX_NBD_BASE_QCOW}"
-#	@[ ! -f "${BOX_NBD_BASE_QCOW}" ] || exit 0 || true
-#	@[ "`grep nbd /proc/partitions | wc -l`" -eq 0 ] && \
-#		echo WARN looks like theres NO nbd mount && \
-#		exit 0
-	[ ! -f ${BOX_NBD_BASE_QCOW} ] || exit 1
+build_base:: lint
+	echo INFO: $@ "${BOX_NBD_BASE_QCOW}"
+	@[ ! -f ${BOX_NBD_BASE_QCOW} ] || { \
+		echo WARN looks like theres already a build of \
+		 "${BOX_NBD_BASE_QCOW}" ; exit 2 ; }
+	@( ! ps ax | grep -v grep | \
+		grep "qemu-nbd.*/dev/nbd.*${BOX_NBD_BASE_QCOW}" ) ||{ \
+		echo WARN looks like theres an active nbd mount of \
+		 "${BOX_NBD_BASE_QCOW}" && exit 1 ; }
 	echo INFO running the toxcore role will build ${BOX_NBD_BASE_QCOW}
 	sudo sh ansible_local.bash --diff -i ${PWD}/hosts.yml \
 		-l ${LOCALHOST} -c local --verbose ${VERBOSE} \
-		$(ROLES) > .build-local-${LOCALHOST} 2>&1
+		$(ROLES) > .$@-${LOCALHOST} 2>&1
 	[ -f ${BOX_NBD_BASE_QCOW} ]
 
 build_overlay::
@@ -94,7 +96,7 @@ check::
 check_localhost::
 	sudo sh ansible_local.bash --diff -i hosts.yml -l ${LOCALHOST} \
 		--check -c local --verbose ${VERBOSE} \
-s		$(ROLES) > .run-$@-${LOCALHOST} 2>&1
+		$(ROLES) > .$@-$@-${LOCALHOST} 2>&1
 
 check_base::
 	ls ${BOX_NBD_BASE_QCOW}
@@ -109,7 +111,7 @@ check_chroot::
 		-m setup -vvv ${YAML_CHROOT_NAME}
 	sudo sh ansible_local.bash --diff -i hosts.yml -l ${YAML_CHROOT_NAME} \
 		--check -c chroot --verbose ${VERBOSE} \
-		$(ROLES) > .check-${YAML_CHROOT_NAME}-${LOCALHOST} 2>&1
+		$(ROLES) > .$@-${YAML_CHROOT_NAME}-${LOCALHOST} 2>&1
 
 check_overlay::
 	sudo /var/local/sbin/hostvms_libvirt_test_ga.bash ${INST_BOX_NAME} ls /
@@ -123,19 +125,19 @@ check_overlay::
 	sudo virsh list | grep -q ${INST_BOX_NAME} || exit 0
 	sudo sh ansible_local.bash --diff -i hosts.yml -l ${INST_BOX_NAME} \
 		--check -c libvirt_qemu --verbose ${VERBOSE} \
-		$(ROLES) > .check-${INST_BOX_NAME}-${LOCALHOST} 2>&1
+		$(ROLES) > .$@-${INST_BOX_NAME}-${LOCALHOST} 2>&1
 
 # Edit hosts.yml and customize this target if you are on a Debianish
 devuan::
 	sudo sh ansible_local.bash --diff -i ${PWD}/hosts.yml \
 		-l devuan -c local --verbose ${VERBOSE} $(ROLES) \
-		> .check-${LOCALHOST} 2>&1
+		> .$@-${LOCALHOST} 2>&1
 
 # Edit hosts.yml and customize this target if you are on a Gentoo
 pentoo::
 	sudo sh ansible_local.bash --diff -i ${PWD}/hosts.yml \
 		-l pentoo -c local --verbose ${VERBOSE} $(ROLES) \
-		> .check-${LOCALHOST} 2>&1
+		> .$@-${LOCALHOST} 2>&1
 
 run::
 	@[ ! -f ${BOX_NBD_BASE_QCOW} ] && \
@@ -158,7 +160,7 @@ run_local:: lint
 		exit 0
 	sudo sh ansible_local.bash --diff -i hosts.yml -l ${LOCALHOST} \
 		-c local --verbose ${VERBOSE} $(ROLES) \
-		> .run-$@-${LOCALHOST} 2>&1
+		> .$@-$@-${LOCALHOST} 2>&1
 
 run_chroot::
 	[ -d /mnt/gentoo/lost+found ] || exit 0
@@ -178,22 +180,32 @@ run_libvirt::
 		-c libvirt_qemu --verbose ${VERBOSE} $(ROLES) \
 		> .run-${INST_BOX_NAME}-${LOCALHOST} 2>&1
 
+# hourly is quick tests, weekly is medium tests, monthly is long tests
+weekly:: test
 test:: 
 	@[ -d /mnt/gentoo/lost+found ] && \
-		sudo $(MAKE) -$(MAKEFLAGS) $@_chroot
+		sudo $(MAKE) -$(MAKEFLAGS) $@_local
 	@[ -f ${INST_BOX_DIR}/images/${INST_BOX_NAME}.img ] && \
-		sudo $(MAKE) -$(MAKEFLAGS) $@_overlay
+		sudo $(MAKE) -$(MAKEFLAGS) $@_libvert
 
-weekly:: test_overlay
-test_overlay::
+test_local::
+	bash .pyanal.sh &
+	sudo sh ansible_local.bash --diff -i ${PWD}/hosts.yml -l ${LOCALHOST} \
+		-c local \
+		--verbose ${VERBOSE} -t weekly \
+		$(ROLES) > .$@-${LOCALHOST}  2>&1
+
+test_libvirt::
 #	bash .pyanal.sh &
 # check if ${INST_BOX_NAME} is running
 	! sudo virsh list | grep -q ${INST_BOX_NAME} && exit 0
 	sudo sh ansible_local.bash --diff -i ${PWD}/hosts.yml \
 		-l ${INST_BOX_NAME} -c libvirt_qemu \
 		--verbose ${VERBOSE} -t weekly \
-		$(ROLES) > .check-${LOCALHOST}  2>&1
+		$(ROLES) > .$@-${LOCALHOST}  2>&1
 
+veryclean:: clean
+	rm -f .run* .check*
 
 clean::
 	find . -name \*~ -delete