From ab76cdfb7c309244c478483d666cbd6430f573ea Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Mon, 26 Mar 2018 14:52:45 -0500
Subject: [PATCH] fix eewiki
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
publish/rcn-ee_eewiki.sh | 44 +++++++++++++++++++++++++++-------------
1 file changed, 30 insertions(+), 14 deletions(-)
diff --git a/publish/rcn-ee_eewiki.sh b/publish/rcn-ee_eewiki.sh
index c463469bb..5276201e4 100755
--- a/publish/rcn-ee_eewiki.sh
+++ b/publish/rcn-ee_eewiki.sh
@@ -10,16 +10,19 @@ if [ -d ./deploy ] ; then
sudo rm -rf ./deploy || true
fi
-#./RootStock-NG.sh -c eewiki_bare_debian_jessie_armel
-#./RootStock-NG.sh -c eewiki_bare_debian_jessie_armhf
-
+if [ ! -f jenkins.build ] ; then
./RootStock-NG.sh -c eewiki_minfs_debian_stretch_armel
./RootStock-NG.sh -c eewiki_minfs_debian_stretch_armhf
./RootStock-NG.sh -c eewiki_minfs_ubuntu_xenial_armhf
+else
+ mkdir -p ${DIR}/deploy/ || true
+fi
debian_stable="debian-9.4"
ubuntu_stable="ubuntu-16.04.4"
-archive="xz -z -8"
+
+xz_img="xz -z -8"
+xz_tar="xz -T2 -z -8"
cat > ${DIR}/deploy/gift_wrap_final_images.sh <<-__EOF__
#!/bin/bash
@@ -33,7 +36,7 @@ copy_base_rootfs_to_mirror () {
if [ ! -f ${mirror_dir}/\${blend}/\${base_rootfs}.tar.xz ] ; then
cp -v \${base_rootfs}.tar ${mirror_dir}/\${blend}/
cd ${mirror_dir}/\${blend}/
- ${archive} \${base_rootfs}.tar && sha256sum \${base_rootfs}.tar.xz > \${base_rootfs}.tar.xz.sha256sum &
+ ${xz_tar} \${base_rootfs}.tar && sha256sum \${base_rootfs}.tar.xz > \${base_rootfs}.tar.xz.sha256sum &
cd -
fi
fi
@@ -54,15 +57,28 @@ __EOF__
chmod +x ${DIR}/deploy/gift_wrap_final_images.sh
-if [ ! -d /mnt/farm/images/ ] ; then
- #nfs mount...
- sudo mount -a
+image_prefix="eewiki"
+#node:
+if [ ! -d /var/www/html/farm/images/ ] ; then
+ if [ ! -d /mnt/farm/images/ ] ; then
+ #nfs mount...
+ sudo mount -a
+ fi
+
+ if [ -d /mnt/farm/images/ ] ; then
+ mkdir -p /mnt/farm/images/${image_prefix}-${time}/ || true
+ echo "Copying: *.tar to server: images/${image_prefix}-${time}/"
+ cp -v ${DIR}/deploy/*.tar /mnt/farm/images/${image_prefix}-${time}/ || true
+ cp -v ${DIR}/deploy/gift_wrap_final_images.sh /mnt/farm/images/${image_prefix}-${time}/gift_wrap_final_images.sh || true
+ chmod +x /mnt/farm/images/${image_prefix}-${time}/gift_wrap_final_images.sh || true
+ fi
fi
-if [ -d /mnt/farm/images/ ] ; then
- mkdir /mnt/farm/images/eewiki-${time}/
- cp -v ${DIR}/deploy/*.tar /mnt/farm/images/eewiki-${time}/
- cp -v ${DIR}/deploy/gift_wrap_final_images.sh /mnt/farm/images/eewiki-${time}/gift_wrap_final_images.sh
- chmod +x /mnt/farm/images/eewiki-${time}/gift_wrap_final_images.sh
+#x86:
+if [ -d /var/www/html/farm/images/ ] ; then
+ mkdir -p /var/www/html/farm/images/${image_prefix}-${time}/ || true
+ echo "Copying: *.tar to server: images/${image_prefix}-${time}/"
+ cp -v ${DIR}/deploy/gift_wrap_final_images.sh /var/www/html/farm/images/${image_prefix}-${time}/gift_wrap_final_images.sh || true
+ chmod +x /var/www/html/farm/images/${image_prefix}-${time}/gift_wrap_final_images.sh || true
+ sudo chown -R apt-cacher-ng:apt-cacher-ng /var/www/html/farm/images/${image_prefix}-${time}/ || true
fi
-
--
GitLab