From c2a1bcd8ad49e51034931474d9faaea5b7dde0c8 Mon Sep 17 00:00:00 2001 From: jialv01 Date: Thu, 11 Apr 2019 16:14:45 +0800 Subject: [PATCH] Add SEBA-serv repo as submodule and support arm64 1.forked SEBA componants`s repo to IEC repo,include: rcord-synchronizer,onos-service,olt-service,fabric,fabric-crossconnect 2.Add patch files inorder to aarch64 docker image support src/use_cases/seba_on_arm/patches/rcord-synchronizer/0001-Modify-rcord-Dockerfile-for-support-Arm64.patch src/use_cases/seba_on_arm/src_repo/fabric src/use_cases/seba_on_arm/src_repo/fabric-crossconnect src/use_cases/seba_on_arm/src_repo/olt-service src/use_cases/seba_on_arm/src_repo/onos-service src/use_cases/seba_on_arm/src_repo/rcord-synchronizer Change-Id: Iaa42ef687f74eaa8e434bec01c090998acfe352d Signed-off-by: jialv01 --- .gitmodules | 18 +++++++++++++++ .../docker/build/fabric-crossconnect/build.arm | 10 +++++++++ .../seba_on_arm/docker/build/fabric/build.arm | 10 +++++++++ .../seba_on_arm/docker/build/olt-service/build.arm | 10 +++++++++ .../docker/build/onos-service/build.arm | 10 +++++++++ .../docker/build/rcord-synchronizer/build.arm | 10 +++++++++ ...Modify-rcord-Dockerfile-for-support-Arm64.patch | 26 ++++++++++++++++++++++ src/use_cases/seba_on_arm/src_repo/fabric | 1 + .../seba_on_arm/src_repo/fabric-crossconnect | 1 + src/use_cases/seba_on_arm/src_repo/olt-service | 1 + src/use_cases/seba_on_arm/src_repo/onos-service | 1 + .../seba_on_arm/src_repo/rcord-synchronizer | 1 + 12 files changed, 99 insertions(+) create mode 100755 src/use_cases/seba_on_arm/docker/build/fabric-crossconnect/build.arm create mode 100755 src/use_cases/seba_on_arm/docker/build/fabric/build.arm create mode 100755 src/use_cases/seba_on_arm/docker/build/olt-service/build.arm create mode 100755 src/use_cases/seba_on_arm/docker/build/onos-service/build.arm create mode 100755 src/use_cases/seba_on_arm/docker/build/rcord-synchronizer/build.arm create mode 100644 src/use_cases/seba_on_arm/patches/rcord-synchronizer/0001-Modify-rcord-Dockerfile-for-support-Arm64.patch create mode 160000 src/use_cases/seba_on_arm/src_repo/fabric create mode 160000 src/use_cases/seba_on_arm/src_repo/fabric-crossconnect create mode 160000 src/use_cases/seba_on_arm/src_repo/olt-service create mode 160000 src/use_cases/seba_on_arm/src_repo/onos-service create mode 160000 src/use_cases/seba_on_arm/src_repo/rcord-synchronizer diff --git a/.gitmodules b/.gitmodules index b4f3f86..ef0f933 100644 --- a/.gitmodules +++ b/.gitmodules @@ -50,3 +50,21 @@ [submodule "sadis-server"] path = src/use_cases/seba_on_arm/src_repo/sadis-server url = https://github.com/iecedge/sadis-server.git +[submodule "rcord-synchronizer"] + path = src/use_cases/seba_on_arm/src_repo/rcord-synchronizer + url = https://github.com/iecedge/rcord.git +[submodule "fabric"] + path = src/use_cases/seba_on_arm/src_repo/fabric + url = https://github.com/iecedge/fabric.git +[submodule "fabric-crossconnect"] + path = src/use_cases/seba_on_arm/src_repo/fabric-crossconnect + url = https://github.com/iecedge/fabric-crossconnect.git + branch = 1.1.4 +[submodule "onos-service"] + path = src/use_cases/seba_on_arm/src_repo/onos-service + url = https://github.com/iecedge/onos-service.git + branch = 2.0.7 +[submodule "olt-service"] + path = src/use_cases/seba_on_arm/src_repo/olt-service + url = https://github.com/iecedge/olt-service.git + branch = 2.1.14 diff --git a/src/use_cases/seba_on_arm/docker/build/fabric-crossconnect/build.arm b/src/use_cases/seba_on_arm/docker/build/fabric-crossconnect/build.arm new file mode 100755 index 0000000..b9872c0 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/fabric-crossconnect/build.arm @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# This script builds the fabric-crossconnect docker image +set -o errexit +set -o xtrace + +#cd $FABRIC-CROSSCONNECT_PATH + +#building fabric-crossconnect docker image +docker build -t iecedge/fabric-crossconnect-synchronizer_arm64:1.1.4 -f Dockerfile.synchronizer . diff --git a/src/use_cases/seba_on_arm/docker/build/fabric/build.arm b/src/use_cases/seba_on_arm/docker/build/fabric/build.arm new file mode 100755 index 0000000..7295946 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/fabric/build.arm @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# This script builds the fabric docker image +set -o errexit +set -o xtrace + +#cd $FABRIC_PATH + +#building fabric docker image +docker build -t iecedge/fabric-synchronizer_arm64:2.1.6 -f Dockerfile.synchronizer . diff --git a/src/use_cases/seba_on_arm/docker/build/olt-service/build.arm b/src/use_cases/seba_on_arm/docker/build/olt-service/build.arm new file mode 100755 index 0000000..3443b79 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/olt-service/build.arm @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# This script builds the olt-service docker image +set -o errexit +set -o xtrace + +#cd $OLT-SERVICE_PATH + +#building olt-service docker image +docker build -t iecedge/volt-synchronizer_arm64:2.1.14 -f Dockerfile.synchronizer . diff --git a/src/use_cases/seba_on_arm/docker/build/onos-service/build.arm b/src/use_cases/seba_on_arm/docker/build/onos-service/build.arm new file mode 100755 index 0000000..e227236 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/onos-service/build.arm @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# This script builds the onos-service docker image +set -o errexit +set -o xtrace + +#cd $ONOS-SERVICE_PATH + +#building onos-service docker image +docker build -f Dockerfile.synchronizer -t iecedge/onos-synchronizer_arm64:2.0.7 . diff --git a/src/use_cases/seba_on_arm/docker/build/rcord-synchronizer/build.arm b/src/use_cases/seba_on_arm/docker/build/rcord-synchronizer/build.arm new file mode 100755 index 0000000..b399615 --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/rcord-synchronizer/build.arm @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# This script builds the rcord-synchronizer docker image +set -o errexit +set -o xtrace + +#cd $RCORD-SYNCHRONIZER _PATH + +#building rcord-synchronizer docker image +docker build -t iecedge/rcord-synchronizer_arm64:1.0.8 -f Dockerfile.synchronizer . diff --git a/src/use_cases/seba_on_arm/patches/rcord-synchronizer/0001-Modify-rcord-Dockerfile-for-support-Arm64.patch b/src/use_cases/seba_on_arm/patches/rcord-synchronizer/0001-Modify-rcord-Dockerfile-for-support-Arm64.patch new file mode 100644 index 0000000..09e505b --- /dev/null +++ b/src/use_cases/seba_on_arm/patches/rcord-synchronizer/0001-Modify-rcord-Dockerfile-for-support-Arm64.patch @@ -0,0 +1,26 @@ +From 4485e25f152b18be11cbdc00287a9ab2146db50c Mon Sep 17 00:00:00 2001 +From: jialv01 +Date: Wed, 3 Apr 2019 17:03:56 +0800 +Subject: [PATCH] Modify rcord Dockerfile for support Arm64 + +Signed-off-by: jialv01 +--- + Dockerfile.synchronizer | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Dockerfile.synchronizer b/Dockerfile.synchronizer +index c84eab6..9509770 100644 +--- a/Dockerfile.synchronizer ++++ b/Dockerfile.synchronizer +@@ -16,7 +16,7 @@ + # docker build -t xosproject/rcord-synchronizer:candidate -f Dockerfile.synchronizer . + + # xosproject/rcord-synchronizer +-FROM xosproject/xos-synchronizer-base:2.1.25 ++FROM cachengo/xos-synchronizer-base:2.1.38 + + COPY xos/synchronizer /opt/xos/synchronizers/rcord + COPY VERSION /opt/xos/synchronizers/rcord/ +-- +2.17.1 + diff --git a/src/use_cases/seba_on_arm/src_repo/fabric b/src/use_cases/seba_on_arm/src_repo/fabric new file mode 160000 index 0000000..dc1d411 --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/fabric @@ -0,0 +1 @@ +Subproject commit dc1d411dca3df3259f4aef9411675e8695f21704 diff --git a/src/use_cases/seba_on_arm/src_repo/fabric-crossconnect b/src/use_cases/seba_on_arm/src_repo/fabric-crossconnect new file mode 160000 index 0000000..3d6a98a --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/fabric-crossconnect @@ -0,0 +1 @@ +Subproject commit 3d6a98a510d18b5683e4be4b96a099a572f5b0c9 diff --git a/src/use_cases/seba_on_arm/src_repo/olt-service b/src/use_cases/seba_on_arm/src_repo/olt-service new file mode 160000 index 0000000..27a51dd --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/olt-service @@ -0,0 +1 @@ +Subproject commit 27a51dd3c60fabcf18faf94bb5f96109f3d24167 diff --git a/src/use_cases/seba_on_arm/src_repo/onos-service b/src/use_cases/seba_on_arm/src_repo/onos-service new file mode 160000 index 0000000..31cd6cd --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/onos-service @@ -0,0 +1 @@ +Subproject commit 31cd6cdd22cbc832a23d040560e2846630b09a0d diff --git a/src/use_cases/seba_on_arm/src_repo/rcord-synchronizer b/src/use_cases/seba_on_arm/src_repo/rcord-synchronizer new file mode 160000 index 0000000..4ed1df6 --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/rcord-synchronizer @@ -0,0 +1 @@ +Subproject commit 4ed1df6a0fac69ec5a947a426ea07face235c43f -- 2.16.6