From 5cf7e86d33669af28dd0b4e7fced9f723b63cb7b Mon Sep 17 00:00:00 2001 From: Artem Smirnov Date: Fri, 21 Sep 2018 20:02:51 +0300 Subject: [PATCH] image_builder: split builder_docker & builder_scripts skip travis --- image_builder/scripts/builder.json => .builder.json | 4 ++-- {image_builder => builder_docker}/Dockerfile | 0 {image_builder => builder_docker}/Jenkinsfile | 0 {image_builder => builder_docker}/README.md | 0 {image_builder => builder_docker}/autosizer.sh | 0 {image_builder => builder_docker}/build.Jenkinsfile | 0 {image_builder => builder_docker}/build.sh | 2 +- {image_builder => builder_docker}/echo_stamp.sh | 0 {image_builder => builder_docker}/get_image.sh | 0 {image_builder => builder_docker}/image_config.sh | 0 {image_builder => builder_docker}/publish_image.sh | 0 {image_builder => builder_docker}/qemu-arm-resin | Bin {image_builder => builder_docker}/resize_fs.sh | 0 {image_builder => builder_docker}/yadisk.py | 0 .../scripts => builder_scripts}/builder.sh | 0 .../scripts => builder_scripts}/hardware_setup.sh | 0 .../scripts => builder_scripts}/init_image.sh | 0 .../scripts => builder_scripts}/init_rpi.sh | 0 .../kinetic-ros-clever.rosinstall | 0 .../kinetic-rosdep-clever.yaml | 0 .../scripts => builder_scripts}/network_setup.sh | 0 .../scripts => builder_scripts}/ros_install.sh | 0 .../scripts => builder_scripts}/software_install.sh | 0 23 files changed, 3 insertions(+), 3 deletions(-) rename image_builder/scripts/builder.json => .builder.json (58%) rename {image_builder => builder_docker}/Dockerfile (100%) rename {image_builder => builder_docker}/Jenkinsfile (100%) rename {image_builder => builder_docker}/README.md (100%) rename {image_builder => builder_docker}/autosizer.sh (100%) rename {image_builder => builder_docker}/build.Jenkinsfile (100%) rename {image_builder => builder_docker}/build.sh (96%) rename {image_builder => builder_docker}/echo_stamp.sh (100%) rename {image_builder => builder_docker}/get_image.sh (100%) rename {image_builder => builder_docker}/image_config.sh (100%) rename {image_builder => builder_docker}/publish_image.sh (100%) rename {image_builder => builder_docker}/qemu-arm-resin (100%) rename {image_builder => builder_docker}/resize_fs.sh (100%) rename {image_builder => builder_docker}/yadisk.py (100%) rename {image_builder/scripts => builder_scripts}/builder.sh (100%) rename {image_builder/scripts => builder_scripts}/hardware_setup.sh (100%) rename {image_builder/scripts => builder_scripts}/init_image.sh (100%) rename {image_builder/scripts => builder_scripts}/init_rpi.sh (100%) rename {image_builder/scripts => builder_scripts}/kinetic-ros-clever.rosinstall (100%) rename {image_builder/scripts => builder_scripts}/kinetic-rosdep-clever.yaml (100%) rename {image_builder/scripts => builder_scripts}/network_setup.sh (100%) rename {image_builder/scripts => builder_scripts}/ros_install.sh (100%) rename {image_builder/scripts => builder_scripts}/software_install.sh (100%) diff --git a/image_builder/scripts/builder.json b/.builder.json similarity index 58% rename from image_builder/scripts/builder.json rename to .builder.json index 3c65c5f4..7815362b 100644 --- a/image_builder/scripts/builder.json +++ b/.builder.json @@ -1,5 +1,5 @@ { - "main_script":"/image_builder/scripts/builder.sh", - "scripts_dir":"/image_builder/scripts", + "main_script":"/builder_scripts/builder.sh", + "scripts_dir":"/builder_scripts", "source_image": "https://downloads.raspberrypi.org/raspbian_lite/images/raspbian_lite-2017-12-01/2017-11-29-raspbian-stretch-lite.zip" } \ No newline at end of file diff --git a/image_builder/Dockerfile b/builder_docker/Dockerfile similarity index 100% rename from image_builder/Dockerfile rename to builder_docker/Dockerfile diff --git a/image_builder/Jenkinsfile b/builder_docker/Jenkinsfile similarity index 100% rename from image_builder/Jenkinsfile rename to builder_docker/Jenkinsfile diff --git a/image_builder/README.md b/builder_docker/README.md similarity index 100% rename from image_builder/README.md rename to builder_docker/README.md diff --git a/image_builder/autosizer.sh b/builder_docker/autosizer.sh similarity index 100% rename from image_builder/autosizer.sh rename to builder_docker/autosizer.sh diff --git a/image_builder/build.Jenkinsfile b/builder_docker/build.Jenkinsfile similarity index 100% rename from image_builder/build.Jenkinsfile rename to builder_docker/build.Jenkinsfile diff --git a/image_builder/build.sh b/builder_docker/build.sh similarity index 96% rename from image_builder/build.sh rename to builder_docker/build.sh index a2428307..e91da38b 100755 --- a/image_builder/build.sh +++ b/builder_docker/build.sh @@ -14,7 +14,7 @@ export LC_ALL=${LC_ALL:='C.UTF-8'} export TARGET_REPO=${TARGET_REPO:='https://github.com/urpylka/clever.git'} export TARGET_REF=${TARGET_REF:='master'} -export TARGET_CONFIG=${TARGET_CONFIG:='/image_builder/scripts/builder.json'} +export TARGET_CONFIG=${TARGET_CONFIG:='/.builder.json'} echo "================================================================================" echo "TARGET_REPO: $TARGET_REPO" diff --git a/image_builder/echo_stamp.sh b/builder_docker/echo_stamp.sh similarity index 100% rename from image_builder/echo_stamp.sh rename to builder_docker/echo_stamp.sh diff --git a/image_builder/get_image.sh b/builder_docker/get_image.sh similarity index 100% rename from image_builder/get_image.sh rename to builder_docker/get_image.sh diff --git a/image_builder/image_config.sh b/builder_docker/image_config.sh similarity index 100% rename from image_builder/image_config.sh rename to builder_docker/image_config.sh diff --git a/image_builder/publish_image.sh b/builder_docker/publish_image.sh similarity index 100% rename from image_builder/publish_image.sh rename to builder_docker/publish_image.sh diff --git a/image_builder/qemu-arm-resin b/builder_docker/qemu-arm-resin similarity index 100% rename from image_builder/qemu-arm-resin rename to builder_docker/qemu-arm-resin diff --git a/image_builder/resize_fs.sh b/builder_docker/resize_fs.sh similarity index 100% rename from image_builder/resize_fs.sh rename to builder_docker/resize_fs.sh diff --git a/image_builder/yadisk.py b/builder_docker/yadisk.py similarity index 100% rename from image_builder/yadisk.py rename to builder_docker/yadisk.py diff --git a/image_builder/scripts/builder.sh b/builder_scripts/builder.sh similarity index 100% rename from image_builder/scripts/builder.sh rename to builder_scripts/builder.sh diff --git a/image_builder/scripts/hardware_setup.sh b/builder_scripts/hardware_setup.sh similarity index 100% rename from image_builder/scripts/hardware_setup.sh rename to builder_scripts/hardware_setup.sh diff --git a/image_builder/scripts/init_image.sh b/builder_scripts/init_image.sh similarity index 100% rename from image_builder/scripts/init_image.sh rename to builder_scripts/init_image.sh diff --git a/image_builder/scripts/init_rpi.sh b/builder_scripts/init_rpi.sh similarity index 100% rename from image_builder/scripts/init_rpi.sh rename to builder_scripts/init_rpi.sh diff --git a/image_builder/scripts/kinetic-ros-clever.rosinstall b/builder_scripts/kinetic-ros-clever.rosinstall similarity index 100% rename from image_builder/scripts/kinetic-ros-clever.rosinstall rename to builder_scripts/kinetic-ros-clever.rosinstall diff --git a/image_builder/scripts/kinetic-rosdep-clever.yaml b/builder_scripts/kinetic-rosdep-clever.yaml similarity index 100% rename from image_builder/scripts/kinetic-rosdep-clever.yaml rename to builder_scripts/kinetic-rosdep-clever.yaml diff --git a/image_builder/scripts/network_setup.sh b/builder_scripts/network_setup.sh similarity index 100% rename from image_builder/scripts/network_setup.sh rename to builder_scripts/network_setup.sh diff --git a/image_builder/scripts/ros_install.sh b/builder_scripts/ros_install.sh similarity index 100% rename from image_builder/scripts/ros_install.sh rename to builder_scripts/ros_install.sh diff --git a/image_builder/scripts/software_install.sh b/builder_scripts/software_install.sh similarity index 100% rename from image_builder/scripts/software_install.sh rename to builder_scripts/software_install.sh