From 5098e78f9057cb9ffa02bd12dfdb3f8908f2dd48 Mon Sep 17 00:00:00 2001
From: Francesco Giacomini <francesco.giacomini@cnaf.infn.it>
Date: Wed, 1 Dec 2021 16:53:44 +0100
Subject: [PATCH] Run the CI job directly on CentOS
* Explicitly install build-time deps needed for this package
* Take the httpg patch from this repo
---
.gitlab-ci.yml | 5 +++--
rpm/make_packaging.sh | 5 +----
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 94cd3af..484e731 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,3 @@
-image: ${CI_REGISTRY}/storm2/build/ngx-voms-build:issue-17-latest
-#image: storm2/ngx-voms-build:latest
stages:
- build
@@ -8,8 +6,11 @@ stages:
build-rpm:
stage: build
+ image: centos:7
script:
- env | sort
+ - sh .devcontainer/assets/install-build-deps.sh
+ - yum install -y rpm-build redhat-rpm-config rpmdevtools
- cd rpm && sh make_packaging.sh ${CI_PROJECT_DIR} && cd ..
- mv ${HOME}/rpmbuild ./rpmbuild
artifacts:
diff --git a/rpm/make_packaging.sh b/rpm/make_packaging.sh
index 8e74c00..97537e9 100644
--- a/rpm/make_packaging.sh
+++ b/rpm/make_packaging.sh
@@ -10,9 +10,6 @@ if [ ! -d "$voms_module_prefix" ]; then
exit 1
fi
-# install rpm build tools:
-sudo yum install -y rpm-build redhat-rpm-config rpmdevtools
-
mkdir -p ${HOME}/rpmbuild/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
cat <<EOF > ${HOME}/.rpmmacros
%_topdir %{getenv:HOME}/rpmbuild
@@ -21,7 +18,7 @@ EOF
cat ${HOME}/.rpmmacros
-cp ${HOME}/nginx-httpg_no_delegation.patch ${HOME}/rpmbuild/SOURCES/
+cp ${voms_module_prefix}/nginx-httpg_no_delegation.patch ${HOME}/rpmbuild/SOURCES/
cp SOURCES/* ${HOME}/rpmbuild/SOURCES/
cp SPECS/*.spec ${HOME}/rpmbuild/SPECS/
--
GitLab