From b1db14fa9d3de67235473773018612c52049d7c8 Mon Sep 17 00:00:00 2001
From: Steven Murray <Steven.Murray@cern.ch>
Date: Tue, 7 Mar 2017 13:35:53 +0100
Subject: [PATCH] GitLab rpm build stage now uses all *.repo files because
protobuf-3 is no longer present
---
.gitlab-ci.yml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0b08b15453..47f4251e80 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -30,8 +30,7 @@ cta_rpm:
stage: build:rpm
image: gitlab-registry.cern.ch/linuxsupport/cc7-base
script:
- - cp -f continuousintegration/docker/ctafrontend/cc7/etc/yum.repos.d/centos-cernonly.repo /etc/yum.repos.d/
- - cp -f continuousintegration/docker/ctafrontend/cc7/etc/yum.repos.d/cta-ci.repo /etc/yum.repos.d/
+ - cp -f continuousintegration/docker/ctafrontend/cc7/etc/yum.repos.d/*.repo /etc/yum.repos.d/
- yum install -y gcc-c++ cmake make rpm-build
- yum -y install yum-plugin-priorities
- yum-builddep --nogpgcheck -y build_srpm/RPM/SRPMS/*
--
GitLab