CI : Move yumgroups files under ci directory; refs issue #51

ipbus · Aug 1, 2017 · d52da2b · d52da2b
1 parent c39bbed
commit d52da2b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -121,7 +121,7 @@ build:slc6:
   image: tswilliams/ipbus-sw-dev-slc6:latest
   variables:
     ADDITIONAL_RPMS_TO_INSTALL: ""
-    YUMGROUPS_FILE: "yumgroups-slc6.xml"
+    YUMGROUPS_FILE: "ci/yumgroups-slc6.xml"
     OUTPUT_REPO_SUBDIR: "slc6_x86_64"
 
 
@@ -130,7 +130,7 @@ build:centos7:
   image: tswilliams/ipbus-sw-dev-cc7:latest
   variables:
     ADDITIONAL_RPMS_TO_INSTALL: "boost-devel pugixml-devel"
-    YUMGROUPS_FILE: "yumgroups-centos7.xml"
+    YUMGROUPS_FILE: "ci/yumgroups-centos7.xml"
     OUTPUT_REPO_SUBDIR: "centos7_x86_64"
 
 

diff --git a/yumgroups-centos7.xml → ci/yumgroups-centos7.xml b/yumgroups-centos7.xml → ci/yumgroups-centos7.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <comps>
   <group>
-    <id>cactus</id>
+    <id>ipbus-sw</id>
     <name>uhal</name>
     <default>true</default>
     <description>uHAL packages of the CACTUS YUM repository</description>

diff --git a/yumgroups-slc6.xml → ci/yumgroups-slc6.xml b/yumgroups-slc6.xml → ci/yumgroups-slc6.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <comps>
   <group>
-    <id>cactus</id>
+    <id>ipbus-sw</id>
     <name>uhal</name>
     <default>true</default>
     <description>uHAL packages of the CACTUS YUM repository</description>