diff --git a/ci/bb.org-jessie-jenkins.txt b/ci/bb.org-jessie-jenkins.txt index b6d1aeda12ed037a8681395f0450bcd175bc78f0..b4ae6c7770fba6e18f641412d1c9407921ad585d 100644 --- a/ci/bb.org-jessie-jenkins.txt +++ b/ci/bb.org-jessie-jenkins.txt @@ -30,6 +30,8 @@ shell: image_prefix=bb.org time=$(date +%Y-%m-%d) +export apt_proxy=apt-proxy:3142/ + if [ ! -f /mnt/farm/images/original.txt ] ; then sudo mount -a || true fi diff --git a/ci/bb.org-stretch-jenkins.txt b/ci/bb.org-stretch-jenkins.txt index 83a05edf43ec438fbedf69c1c6fa8086e46be5da..ecef0abcb7ebd9e41b53c8b712a90552539cb5b9 100644 --- a/ci/bb.org-stretch-jenkins.txt +++ b/ci/bb.org-stretch-jenkins.txt @@ -12,15 +12,20 @@ touch jenkins.build ./publish/rcn-ee_bb.org-stable.sh ######## -bb.org-debian-stretch-console-v4.9 -bb.org-debian-stretch-iot-v4.4 -bb.org-debian-stretch-iot-v4.9 -bb.org-debian-stretch-lxqt-2gb-v4.9 -bb.org-debian-stretch-lxqt-v4.9 +machinekit-debian-stretch + +bb.org-debian-stretch-console-v4.14 +bb.org-debian-stretch-iot-v4.14 +bb.org-debian-stretch-lxqt-2gb-v4.14 +bb.org-debian-stretch-lxqt-v4.14 bb.org-debian-stretch-lxqt-xm bb.org-debian-stretch-oemflasher-v4.4 -bb.org-debian-buster-iot-v4.9 +bb.org-debian-buster-iot-v4.14 +bb.org-debian-buster-efi-iot-v4.14 +bb.org-debian-buster-gobot-iot-v4.14 + +bb.org-ubuntu-bionic-ros-iot-v4.14 shell: ######## @@ -29,6 +34,8 @@ shell: image_prefix=bb.org time=$(date +%Y-%m-%d) +export apt_proxy=apt-proxy:3142/ + if [ ! -f /mnt/farm/images/original.txt ] ; then sudo mount -a || true fi @@ -37,15 +44,20 @@ if [ -d ./deploy ] ; then rm -rf ./deploy || true fi -#./RootStock-NG.sh -c bb.org-debian-stretch-console-v4.9 -#./RootStock-NG.sh -c bb.org-debian-stretch-iot-v4.4 -#./RootStock-NG.sh -c bb.org-debian-stretch-iot-v4.9 -#./RootStock-NG.sh -c bb.org-debian-stretch-lxqt-2gb-v4.9 -#./RootStock-NG.sh -c bb.org-debian-stretch-lxqt-v4.9 +#./RootStock-NG.sh -c machinekit-debian-stretch + +#./RootStock-NG.sh -c bb.org-debian-stretch-console-v4.14 +#./RootStock-NG.sh -c bb.org-debian-stretch-iot-v4.14 +#./RootStock-NG.sh -c bb.org-debian-stretch-lxqt-2gb-v4.14 +#./RootStock-NG.sh -c bb.org-debian-stretch-lxqt-v4.14 #./RootStock-NG.sh -c bb.org-debian-stretch-lxqt-xm #./RootStock-NG.sh -c bb.org-debian-stretch-oemflasher-v4.4 -#./RootStock-NG.sh -c bb.org-debian-buster-iot-v4.9 +#./RootStock-NG.sh -c bb.org-debian-buster-iot-v4.14 +#./RootStock-NG.sh -c bb.org-debian-buster-efi-iot-v4.14 +#./RootStock-NG.sh -c bb.org-debian-buster-gobot-iot-v4.14 + +#./RootStock-NG.sh -c bb.org-ubuntu-bionic-ros-iot-v4.14 if [ -f ./deploy/*.tar ] ; then ls -lha ./deploy/ diff --git a/ci/elinux-jenkins.txt b/ci/elinux-jenkins.txt index 83de74a4d90297fe9ab0c50896bd555ffbe97298..686f73c04f6f06e7c9ab20fe592e3f329a806893 100644 --- a/ci/elinux-jenkins.txt +++ b/ci/elinux-jenkins.txt @@ -14,7 +14,7 @@ touch jenkins.build elinux_debian_buster_armhf elinux_debian_stretch_armhf -elinux_ubuntu_xenial_armhf +elinux_ubuntu_bionic_armhf shell: ######## @@ -23,6 +23,8 @@ shell: image_prefix=elinux time=$(date +%Y-%m-%d) +export apt_proxy=apt-proxy:3142/ + if [ ! -f /mnt/farm/images/original.txt ] ; then sudo mount -a || true fi @@ -33,7 +35,7 @@ fi #./RootStock-NG.sh -c rcn-ee_console_debian_stretch_armhf #./RootStock-NG.sh -c rcn-ee_console_debian_buster_armhf -#./RootStock-NG.sh -c rcn-ee_console_ubuntu_xenial_armhf +#./RootStock-NG.sh -c rcn-ee_console_ubuntu_bionic_armhf if [ -f ./deploy/*.tar ] ; then ls -lha ./deploy/