X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=SPECS%2Fcaas-helm.spec;h=b68aa28db22c999460d3ced2121530bb2ac4396c;hb=14c3d7f410dc71ce5b6c8947c72b7c52b1f9e042;hp=87d69d391cb8db6efc8f37ab195618d3e5191c4b;hpb=cf9e279cdad75e3bacaa71fb0323f1284288b73a;p=ta%2Fcaas-helm.git

diff --git a/SPECS/caas-helm.spec b/SPECS/caas-helm.spec
index 87d69d3..b68aa28 100644
--- a/SPECS/caas-helm.spec
+++ b/SPECS/caas-helm.spec
@@ -14,27 +14,27 @@
 
 %define COMPONENT helm
 %define RPM_NAME caas-%{COMPONENT}
-%define RPM_MAJOR_VERSION 2.13.1
-%define RPM_MINOR_VERSION 1
+%define RPM_MAJOR_VERSION 2.14.3
+%define RPM_MINOR_VERSION 4
 %define IMAGE_TAG %{RPM_MAJOR_VERSION}-%{RPM_MINOR_VERSION}
-%define go_version 1.11.5
-%define cni_plugins_version 0.7.0
+%define go_version 1.12.10
 %define binary_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/binary-save
 %define docker_build_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-build
 %define docker_save_dir %{_builddir}/%{RPM_NAME}-%{RPM_MAJOR_VERSION}/docker-save
 %define built_binaries_dir /binary-save
+%define centos_build 191001
 
 Name:           %{RPM_NAME}
 Version:        %{RPM_MAJOR_VERSION}
 Release:        %{RPM_MINOR_VERSION}%{?dist}
 Summary:        Containers as a Service %{COMPONENT} component
 License:        %{_platform_licence} and MIT license and BSD and Apache License and Lesser General Public License
-BuildArch:      x86_64
+BuildArch:      %{_arch}
 Vendor:         %{_platform_vendor} and helm/helm unmodified
 Source0:        %{name}-%{version}.tar.gz
 
-Requires: docker-ce >= 18.09.2
-BuildRequires: docker-ce-cli >= 18.09.2
+Requires: docker-ce >= 18.09.2, rsync
+BuildRequires: docker-ce-cli >= 18.09.2, rsync, xz, wget
 
 %description
 This rpm contains the %{COMPONENT} container for CaaS subsystem.
@@ -44,6 +44,7 @@ This container contains the %{COMPONENT} service.
 %autosetup
 
 %build
+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}/helm-builder/centos-7-docker.tar.xz
 # Build Helm binaries
 docker build \
   --network=host \
@@ -83,7 +84,7 @@ docker build \
   --tag tiller:%{IMAGE_TAG} \
   %{docker_build_dir}/tiller
 mkdir -p %{docker_save_dir}/
-docker save tiller:%{IMAGE_TAG} | gzip -c > "%{docker_save_dir}/tiller:%{IMAGE_TAG}.tar"
+docker save tiller:%{IMAGE_TAG} | xz -z -T2 > "%{docker_save_dir}/tiller:%{IMAGE_TAG}.tar"
 docker rmi tiller:%{IMAGE_TAG}
 
 %install