From 6d3b9403d7e828ac576f768eb853f8ec08f94e1b Mon Sep 17 00:00:00 2001 From: jialv01 Date: Thu, 11 Apr 2019 17:55:41 +0800 Subject: [PATCH] Add voltha repo as submodule and support arm64 1.forked SEBA componants`s repo to IEC repo,include: freeradius, voltha 2.Add patch files inorder to aarch64 docker image support src/use_cases/seba_on_arm/docker/build/freeradius/build.arm src/use_cases/seba_on_arm/docker/build/voltha/build.arm src/use_cases/seba_on_arm/patches/voltha/0001-pin-pynacl-to-1.1.2-recent-version-fail-to-install.patch src/use_cases/seba_on_arm/patches/voltha/0002-Support-ponsim-arm64-docker-image-build.patch src/use_cases/seba_on_arm/src_repo/freeradius src/use_cases/seba_on_arm/src_repo/voltha Change-Id: I3edeefb7ce3feeb58d960e022ed1aeb38be52333 Signed-off-by: jialv01 --- .gitmodules | 7 ++++++ .../seba_on_arm/docker/build/freeradius/build.arm | 10 ++++++++ .../seba_on_arm/docker/build/voltha/build.arm | 17 +++++++++++++ ...l-to-1.1.2-recent-version-fail-to-install.patch | 27 +++++++++++++++++++++ ...2-Support-ponsim-arm64-docker-image-build.patch | 28 ++++++++++++++++++++++ src/use_cases/seba_on_arm/src_repo/freeradius | 1 + src/use_cases/seba_on_arm/src_repo/voltha | 1 + 7 files changed, 91 insertions(+) create mode 100755 src/use_cases/seba_on_arm/docker/build/freeradius/build.arm create mode 100755 src/use_cases/seba_on_arm/docker/build/voltha/build.arm create mode 100644 src/use_cases/seba_on_arm/patches/voltha/0001-pin-pynacl-to-1.1.2-recent-version-fail-to-install.patch create mode 100644 src/use_cases/seba_on_arm/patches/voltha/0002-Support-ponsim-arm64-docker-image-build.patch create mode 160000 src/use_cases/seba_on_arm/src_repo/freeradius create mode 160000 src/use_cases/seba_on_arm/src_repo/voltha diff --git a/.gitmodules b/.gitmodules index 2405e81..f35bd06 100644 --- a/.gitmodules +++ b/.gitmodules @@ -114,3 +114,10 @@ path = src/use_cases/seba_on_arm/src_repo/pushgateway url = https://github.com/iecedge/pushgateway.git branch = v0.5.2-arm64v8 +[submodule "freeradius"] + path = src/use_cases/seba_on_arm/src_repo/freeradius + url = https://github.com/iecedge/freeradius.git +[submodule "voltha"] + path = src/use_cases/seba_on_arm/src_repo/voltha + url = https://github.com/iecedge/voltha.git + branch = jglr_move_to_cachengo_infra diff --git a/src/use_cases/seba_on_arm/docker/build/freeradius/build.arm b/src/use_cases/seba_on_arm/docker/build/freeradius/build.arm new file mode 100755 index 0000000..40d0f1d --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/freeradius/build.arm @@ -0,0 +1,10 @@ +#!/usr/bin/env bash + +# This script builds the freeradius docker image +set -o errexit +set -o xtrace + +#cd $FREERADIUS_PATH + +#building freeradius docker image +docker build -t iecedge/freeradius_arm64:2.2.8 . diff --git a/src/use_cases/seba_on_arm/docker/build/voltha/build.arm b/src/use_cases/seba_on_arm/docker/build/voltha/build.arm new file mode 100755 index 0000000..9f3ba7d --- /dev/null +++ b/src/use_cases/seba_on_arm/docker/build/voltha/build.arm @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +# This script builds the voltha docker images +set -o errexit +set -o xtrace + +#cd $VOLTHA_PATH + +#building voltha docker images +VOLTHA_BUILD=docker make seba +docker tag voltha-voltha:latest iecedge/voltha-voltha_arm64:1.6.0 +docker tag voltha-cli:latest iecedge/voltha-cli_arm64:1.6.0 +docker tag voltha-ofagent:latest iecedge/voltha-ofagent_arm64:1.6.0 +docker tag voltha-netconf:latest iecedge/voltha-netconf_arm64:1.6.0 +docker tag voltha-envoy:latest iecedge/voltha-envoy_arm64:1.6.0 +docker tag voltha-alarm-generator:latest iecedge/voltha-alarm-generator_arm64:1.6.0 +docker tag voltha-ponsim:latest iecedge/voltha-ponsim_arm64:1.6.0 diff --git a/src/use_cases/seba_on_arm/patches/voltha/0001-pin-pynacl-to-1.1.2-recent-version-fail-to-install.patch b/src/use_cases/seba_on_arm/patches/voltha/0001-pin-pynacl-to-1.1.2-recent-version-fail-to-install.patch new file mode 100644 index 0000000..4492497 --- /dev/null +++ b/src/use_cases/seba_on_arm/patches/voltha/0001-pin-pynacl-to-1.1.2-recent-version-fail-to-install.patch @@ -0,0 +1,27 @@ +From 9108849f974a6513027b2cb80f64e5ee0f22a9fe Mon Sep 17 00:00:00 2001 +From: jialv01 +Date: Wed, 10 Apr 2019 14:23:31 +0800 +Subject: [PATCH] pin pynacl to 1.1.2 recent version fail to install + +pin pynacl to 1.1.2, Recent versions of pynacl, specifically 1.2.0, 1.2.1, and 1.3.0 fail to install + +Signed-off-by: jialv01 +--- + requirements.txt | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/requirements.txt b/requirements.txt +index 5f2cfd2..004a069 100755 +--- a/requirements.txt ++++ b/requirements.txt +@@ -63,6 +63,7 @@ etcd3==0.7.0 + pyparsing==2.2.0 + packaging==17.1 + pexpect==4.6.0 ++pynacl==1.1.2 + + # python-consul>=0.6.1 we need the pre-released version for now, because 0.6.1 does not + # yet support Twisted. Once this is released, it will be the 0.6.2 version +-- +2.17.1 + diff --git a/src/use_cases/seba_on_arm/patches/voltha/0002-Support-ponsim-arm64-docker-image-build.patch b/src/use_cases/seba_on_arm/patches/voltha/0002-Support-ponsim-arm64-docker-image-build.patch new file mode 100644 index 0000000..29d771c --- /dev/null +++ b/src/use_cases/seba_on_arm/patches/voltha/0002-Support-ponsim-arm64-docker-image-build.patch @@ -0,0 +1,28 @@ +From bc98df909b9551f62fc5777c79f3903fee704bf6 Mon Sep 17 00:00:00 2001 +From: jialv01 +Date: Thu, 11 Apr 2019 13:58:56 +0800 +Subject: [PATCH 2/2] Support ponsim arm64 docker image build + +Support ponsim arm64 docker image build + +Signed-off-by: jialv01 +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index d015bb2..c6ceded 100644 +--- a/Makefile ++++ b/Makefile +@@ -237,7 +237,7 @@ jenkins-containers: base voltha ofagent netconf consul cli envoy fluentd unum j2 + + prod-containers: base voltha ofagent netconf shovel onos dashd cli grafana consul tools envoy fluentd unum j2 + +-seba-containers: base voltha ofagent netconf shovel onos tester config-push dashd cli portainer envoy alarm-generator test_runner ++seba-containers: base voltha ofagent netconf shovel onos tester config-push dashd cli portainer envoy alarm-generator ponsim test_runner + + containers: base voltha ofagent netconf shovel onos tester config-push dashd cli portainer grafana nginx consul tools envoy fluentd unum ponsim j2 alarm-generator test_runner + +-- +2.17.1 + diff --git a/src/use_cases/seba_on_arm/src_repo/freeradius b/src/use_cases/seba_on_arm/src_repo/freeradius new file mode 160000 index 0000000..017861f --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/freeradius @@ -0,0 +1 @@ +Subproject commit 017861f7ac6191e501cff9bd01900d0ffe622916 diff --git a/src/use_cases/seba_on_arm/src_repo/voltha b/src/use_cases/seba_on_arm/src_repo/voltha new file mode 160000 index 0000000..4c9bf24 --- /dev/null +++ b/src/use_cases/seba_on_arm/src_repo/voltha @@ -0,0 +1 @@ +Subproject commit 4c9bf24d5a345d827bd60fd1a691740a3da9a2c9 -- 2.16.6