X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=SPECS%2Fcaas-danm.spec;h=28edf36d8c6b219de3c1be5766fbc8c1234595b9;hb=4b2ffa5ec4e454939b7e887f30f11c8aa6c52a82;hp=b0a5560e6ab9a7dc762d0bb83f7305701dbddba2;hpb=31349430c54e4ce1f649376614e4b09738954d5d;p=ta%2Fcaas-danm.git

diff --git a/SPECS/caas-danm.spec b/SPECS/caas-danm.spec
index b0a5560..28edf36 100644
--- a/SPECS/caas-danm.spec
+++ b/SPECS/caas-danm.spec
@@ -14,11 +14,11 @@
 
 %define COMPONENT danm
 %define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 4.0.0
+%define RPM_MAJOR_VERSION 4.1.0
 %define RPM_MINOR_VERSION 2
-%define DANM_VERSION v%{RPM_MAJOR_VERSION}
-%define CNI_VERSION 0.7.0
-%define go_version 1.12.1
+%define DANM_VERSION d3ecc88cb04d55373ff789de52427c9de2c438d3
+%define CNI_VERSION 0.8.1
+%define go_version 1.12.10
 %define SRIOV_VERSION 9e4c973b2ac517c64867e33d61aee152d70dc330
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
 %define binary_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/binary-save
@@ -27,6 +27,12 @@
 %define built_binaries_dir /binary-save
 %define danm_components danm fakeipam
 %define cnis flannel sriov
+%define centos_build 191001
+%ifarch aarch64
+%define CNI_PLUGINS_ARCH arm64
+%else
+%define CNI_PLUGINS_ARCH amd64
+%endif
 
 Name:           %{RPM_NAME}
 Version:        %{RPM_MAJOR_VERSION}
@@ -34,12 +40,12 @@ Release:        %{RPM_MINOR_VERSION}%{?dist}
 Summary:        Containers as a Service %{COMPONENT} component
 License:        %{_platform_license} and BSD 3-Clause License
 URL:            https://github.com/nokia/danm
-BuildArch:      x86_64
-Vendor:         %{_platform_vendor} and Nokia
+BuildArch:      %{_arch}
+Vendor:         %{_platform_vendor} and Nokia and Others unmodified
 Source0:        %{name}-%{version}.tar.gz
 
 Requires: docker-ce >= 18.09.2, iputils, rsync
-BuildRequires: docker-ce-cli >= 18.09.2, curl
+BuildRequires: docker-ce-cli >= 18.09.2, curl, wget
 
 # more info at: https://fedoraproject.org/wiki/Packaging:Debuginfo No build ID note in Flannel
 %global debug_package %{nil}
@@ -52,9 +58,10 @@ This RPM contains the DANM and related CNI binaries for CaaS subsystem.
 
 %build
 mkdir -p %{binary_build_dir}/cni
-curl -fsSL -k https://github.com/containernetworking/plugins/releases/download/v%{CNI_VERSION}/cni-plugins-amd64-v%{CNI_VERSION}.tgz  | tar zx --strip-components=1 -C %{binary_build_dir}/cni
+curl -fsSL -k https://github.com/containernetworking/plugins/releases/download/v%{CNI_VERSION}/cni-plugins-linux-%{CNI_PLUGINS_ARCH}-v%{CNI_VERSION}.tgz  | tar zx --strip-components=1 -C %{binary_build_dir}/cni
 
 # Build DANM binaries
+wget --progress=dot:giga http://artifacts.ci.centos.org/sig-cloudinstance/centos-7-%{centos_build}/%{_arch}/centos-7-%{_arch}-docker.tar.xz -O %{docker_build_dir}/danm-builder/centos-7-docker.tar.xz
 docker build \
   --network=host \
   --no-cache \
@@ -81,6 +88,7 @@ docker rm -f ${builder_container}
 docker rmi danm-builder:%{IMAGE_TAG}
 
 # Build CNI binaries
+wget --progress=dot:giga http://artifacts.ci.centos.org/sig-cloudinstance/centos-7-%{centos_build}/%{_arch}/centos-7-%{_arch}-docker.tar.xz -O %{docker_build_dir}/cni-builder/centos-7-docker.tar.xz
 docker build \
   --network=host \
   --no-cache \