From 5c85755b3008896cf9fba088bce1ce76d6050d00 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Tue, 19 Dec 2017 19:48:42 +0200 Subject: [PATCH] up to 10.2 gitlab-ci-multi-runner was renamed to gitlab-runner in gitlab 10 --- gitlab-ci-multi-runner-images.spec | 53 ---------------------------- gitlab-runner-images.spec | 55 ++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+), 53 deletions(-) delete mode 100644 gitlab-ci-multi-runner-images.spec create mode 100644 gitlab-runner-images.spec diff --git a/gitlab-ci-multi-runner-images.spec b/gitlab-ci-multi-runner-images.spec deleted file mode 100644 index b3f172f..0000000 --- a/gitlab-ci-multi-runner-images.spec +++ /dev/null @@ -1,53 +0,0 @@ -Summary: Prebuilt docker images for gitlab-ci-multi-runner -Name: gitlab-ci-multi-runner-images -Version: 9.5.0 -Release: 3 -License: MIT -Group: Development/Building -Source0: http://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v%{version}/docker/prebuilt-x86_64.tar.xz -# Source0-md5: 3e17865359e937955302f73752426cd4 -Source1: http://gitlab-ci-multi-runner-downloads.s3.amazonaws.com/v%{version}/docker/prebuilt-arm.tar.xz -# Source1-md5: 3e566c807f5d9ad654a29e133b3f683d -URL: https://gitlab.com/gitlab-org/gitlab-ci-multi-runner/tree/master/dockerfiles/build -BuildArch: noarch -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) - -%define imgdir /var/lib/gitlab-runner - -%description -Prebuilt docker images for gitlab-ci-multi-runner. - -%package -n gitlab-ci-multi-runner-image-arm -Summary: Prebuilt arm docker image for gitlab-ci-multi-runner -Group: Development/Building - -%description -n gitlab-ci-multi-runner-image-arm -Prebuilt arm docker image for gitlab-ci-multi-runner. - -%package -n gitlab-ci-multi-runner-image-x86_64 -Summary: Prebuilt arm docker image for gitlab-ci-multi-runner -Group: Development/Building - -%description -n gitlab-ci-multi-runner-image-x86_64 -Prebuilt arm docker image for gitlab-ci-multi-runner. - -%prep -%setup -qcT - -%install -rm -rf $RPM_BUILD_ROOT -install -d $RPM_BUILD_ROOT%{imgdir} - -cp -p %{SOURCE0} $RPM_BUILD_ROOT%{imgdir} -cp -p %{SOURCE1} $RPM_BUILD_ROOT%{imgdir} - -%clean -rm -rf $RPM_BUILD_ROOT - -%files -n gitlab-ci-multi-runner-image-arm -%defattr(644,root,root,755) -%{imgdir}/prebuilt-arm.tar.xz - -%files -n gitlab-ci-multi-runner-image-x86_64 -%defattr(644,root,root,755) -%{imgdir}/prebuilt-x86_64.tar.xz diff --git a/gitlab-runner-images.spec b/gitlab-runner-images.spec new file mode 100644 index 0000000..f7e23d9 --- /dev/null +++ b/gitlab-runner-images.spec @@ -0,0 +1,55 @@ +Summary: Prebuilt docker images for gitlab-runner +Name: gitlab-runner-images +Version: 10.2.0 +Release: 1 +License: MIT +Group: Development/Building +Source0: http://gitlab-runner-downloads.s3.amazonaws.com/v%{version}/docker/prebuilt-x86_64.tar.xz +# Source0-md5: ada4fed13edd764fc66f286246b89cbe +Source1: http://gitlab-runner-downloads.s3.amazonaws.com/v%{version}/docker/prebuilt-arm.tar.xz +# Source1-md5: 17c4e694df6b0b8a0a12f9b027f337fb +URL: https://gitlab.com/gitlab-org/gitlab-runner/tree/master/dockerfiles/build +BuildArch: noarch +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) + +%define imgdir /var/lib/gitlab-runner + +%description +Prebuilt docker images for gitlab-runner. + +%package -n gitlab-runner-image-arm +Summary: Prebuilt arm docker image for gitlab-runner +Group: Development/Building +Obsoletes: gitlab-ci-multi-runner-image-arm < 10.0 + +%description -n gitlab-runner-image-arm +Prebuilt arm docker image for gitlab-runner. + +%package -n gitlab-runner-image-x86_64 +Summary: Prebuilt arm docker image for gitlab-runner +Group: Development/Building +Obsoletes: gitlab-ci-multi-runner-image-x86_64 < 10.0 + +%description -n gitlab-runner-image-x86_64 +Prebuilt arm docker image for gitlab-runner. + +%prep +%setup -qcT + +%install +rm -rf $RPM_BUILD_ROOT +install -d $RPM_BUILD_ROOT%{imgdir} + +cp -p %{SOURCE0} $RPM_BUILD_ROOT%{imgdir} +cp -p %{SOURCE1} $RPM_BUILD_ROOT%{imgdir} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files -n gitlab-runner-image-arm +%defattr(644,root,root,755) +%{imgdir}/prebuilt-arm.tar.xz + +%files -n gitlab-runner-image-x86_64 +%defattr(644,root,root,755) +%{imgdir}/prebuilt-x86_64.tar.xz -- 2.44.0