From 58954391378729179b906dbfb0e4c123aabecb5b Mon Sep 17 00:00:00 2001 From: jialv01 Date: Thu, 4 Apr 2019 16:32:57 +0800 Subject: [PATCH] Add XOS repo as submodule and support arm64 1.forked SEBA componants`s repo to IEC repo,include: xos,xos-tosca,cord-tester,xos-gui,xos-rest-gw 2.Add patch files inorder to aarch64 docker image support src/use_cases/seba_on_arm/src_repo/cord-tester src/use_cases/seba_on_arm/src_repo/xos src/use_cases/seba_on_arm/src_repo/xos-gui src/use_cases/seba_on_arm/src_repo/xos-tosca src/use_cases/seba_on_arm/src_repo/xos-ws src/use_cases/seba_on_arm/docker/build/cord-tester/ src/use_cases/seba_on_arm/docker/build/xos-gui/ src/use_cases/seba_on_arm/docker/build/xos-tosca/ src/use_cases/seba_on_arm/docker/build/xos-ws/ src/use_cases/seba_on_arm/docker/build/xos/ Change-Id: I1a0f7c8e5983aab830dfff34bc2127477f37768f Signed-off-by: jialv01 --- .gitmodules | 17 +++++++++++++++++ .../seba_on_arm/docker/build/cord-tester/build.arm | 11 +++++++++++ .../seba_on_arm/docker/build/xos-gui/build.arm | 10 ++++++++++ .../seba_on_arm/docker/build/xos-tosca/build.arm | 11 +++++++++++ src/use_cases/seba_on_arm/docker/build/xos-ws/build.arm | 10 ++++++++++ src/use_cases/seba_on_arm/docker/build/xos/build.arm | 15 +++++++++++++++ src/use_cases/seba_on_arm/src_repo/cord-tester | 1 + src/use_cases/seba_on_arm/src_repo/xos | 1 + src/use_cases/seba_on_arm/src_repo/xos-gui | 1 + src/use_cases/seba_on_arm/src_repo/xos-tosca | 1 + src/use_cases/seba_on_arm/src_repo/xos-ws | 1 + 11 files changed, 79 insertions(+) create mode 100755 src/use_cases/seba_on_arm/docker/build/cord-tester/build.arm create mode 100755 src/use_cases/seba_on_arm/docker/build/xos-gui/build.arm create mode 100755 src/use_cases/seba_on_arm/docker/build/xos-tosca/build.arm create mode 100755 src/use_cases/seba_on_arm/docker/build/xos-ws/build.arm create mode 100755 src/use_cases/seba_on_arm/docker/build/xos/build.arm create mode 160000 src/use_cases/seba_on_arm/src_repo/cord-tester create mode 160000 src/use_cases/seba_on_arm/src_repo/xos create mode 160000 src/use_cases/seba_on_arm/src_repo/xos-gui create mode 160000 src/use_cases/seba_on_arm/src_repo/xos-tosca create mode 160000 src/use_cases/seba_on_arm/src_repo/xos-ws diff --git a/.gitmodules b/.gitmodules index caca036..4cfd792 100644 --- a/.gitmodules +++ b/.gitmodules @@ -22,3 +22,20 @@ [submodule "jmx-prometheus-exporter"] path = src/use_cases/seba_on_arm/src_repo/jmx-prometheus-exporter url = https://github.com/iecedge/docker-jmx-prometheus-exporter.git +[submodule "xos"] + path = src/use_cases/seba_on_arm/src_repo/xos + url = https://github.com/iecedge/xos.git + branch = 2.1.25 +[submodule "xos-tosca"] + path = src/use_cases/seba_on_arm/src_repo/xos-tosca + url = https://github.com/iecedge/xos-tosca.git + branch = 1.1.6 +[submodule "cord-tester"] + path = src/use_cases/seba_on_arm/src_repo/cord-tester + url = https://github.com/iecedge/cord-tester.git +[submodule "xos-gui"] + path = src/use_cases/seba_on_arm/src_repo/xos-gui + url = https://github.com/iecedge/xos-gui.git +[submodule "xos-ws"] + path = src/use_cases/seba_on_arm/src_repo/xos-ws + url = https://github.com/iecedge/xos-rest-gw.git diff --git a/src/use_cases/seba_on_arm/docker/build/cord-tester/build.arm b/src/use_cases/seba_on_arm/docker/build/cord-tester/build.arm new file mode 100755 index 0000000..11d2c22 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/cord-tester/build.arm @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# This script builds the cord-tester docker image +set -o errexit +set -o xtrace + +#cd $CORD-TESTER_PATH + +#building cord-tester docker image +cd src/test/cord-api/ +docker build -f Dockerfile.k8s-api-tester -t iecedge/xos-api-tester_arm64:master . diff --git a/src/use_cases/seba_on_arm/docker/build/xos-gui/build.arm b/src/use_cases/seba_on_arm/docker/build/xos-gui/build.arm new file mode 100755 index 0000000..a97bd76 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/xos-gui/build.arm @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# This script builds the xos-gui docker image +set -o errexit +set -o xtrace + +#cd $XOS-GUI_PATH + +#building xos-gui docker image +docker build -f Dockerfile -t iecedge/xos-gui_arm64:master . diff --git a/src/use_cases/seba_on_arm/docker/build/xos-tosca/build.arm b/src/use_cases/seba_on_arm/docker/build/xos-tosca/build.arm new file mode 100755 index 0000000..d381c88 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/xos-tosca/build.arm @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +# This script builds the xos-tosca docker image +set -o errexit +set -o xtrace + +#cd $XOS-TOSCA_PATH + +#building xos-tosca docker image +make build +docker tag xosproject/xos-tosca:latest iecedge/xos-tosca_arm64:1.1.6 diff --git a/src/use_cases/seba_on_arm/docker/build/xos-ws/build.arm b/src/use_cases/seba_on_arm/docker/build/xos-ws/build.arm new file mode 100755 index 0000000..a40f5a2 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/xos-ws/build.arm @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# This script builds the xos-ws docker image +set -o errexit +set -o xtrace + +#cd $XOS-WS_PATH + +#building xos-ws docker image +docker build -t iecedge/xos-ws_arm64:master . diff --git a/src/use_cases/seba_on_arm/docker/build/xos/build.arm b/src/use_cases/seba_on_arm/docker/build/xos/build.arm new file mode 100755 index 0000000..f404cb7 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/xos/build.arm @@ -0,0 +1,15 @@ +#!/usr/bin/env bash + +# This script builds the xos docker image +set -o errexit +set -o xtrace + +#cd $XOS_PATH + +#building xos-core docker image +docker build -f ./containers/xos/Dockerfile.xos-core -t iecedge/xos-core_arm64 . + +#building Chameleon for XOS +cd containers/chameleon +make +docker build -f Dockerfile.chameleon -t iecedge/chameleon_arm64:2.1.25 . diff --git a/src/use_cases/seba_on_arm/src_repo/cord-tester b/src/use_cases/seba_on_arm/src_repo/cord-tester new file mode 160000 index 0000000..cbe174c --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/cord-tester @@ -0,0 +1 @@ +Subproject commit cbe174c8b830f472731f5b729a32ee08d4555995 diff --git a/src/use_cases/seba_on_arm/src_repo/xos b/src/use_cases/seba_on_arm/src_repo/xos new file mode 160000 index 0000000..c22305d --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/xos @@ -0,0 +1 @@ +Subproject commit c22305da34a0aef9e89f7f636b4ae06beed5e85c diff --git a/src/use_cases/seba_on_arm/src_repo/xos-gui b/src/use_cases/seba_on_arm/src_repo/xos-gui new file mode 160000 index 0000000..292dc88 --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/xos-gui @@ -0,0 +1 @@ +Subproject commit 292dc884f1d94e34404a34967cf2c180219444eb diff --git a/src/use_cases/seba_on_arm/src_repo/xos-tosca b/src/use_cases/seba_on_arm/src_repo/xos-tosca new file mode 160000 index 0000000..ea0d963 --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/xos-tosca @@ -0,0 +1 @@ +Subproject commit ea0d963c70431dad1fe6b8149d99d011b4b72bbf diff --git a/src/use_cases/seba_on_arm/src_repo/xos-ws b/src/use_cases/seba_on_arm/src_repo/xos-ws new file mode 160000 index 0000000..29e6c7c --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/xos-ws @@ -0,0 +1 @@ +Subproject commit 29e6c7ce992e8395ce024adbce2fe89ebb3f3487 -- 2.16.6