almost there

DIRACGrid · Jan 28, 2021 · 0d08772 · 0d08772
1 parent 384d9f0
commit 0d08772
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 7 deletions.
diff --git a/config/diracos.json b/config/diracos.json
@@ -480,6 +480,9 @@
          },
          {
             "name": "gfal2",
+            "RCRepos": "https://dmc-repo.web.cern.ch/dmc-repo/rc/",
+            "TestingRepos": "https://dmc-repo.web.cern.ch/dmc-repo/testing/",
+            "ProdRepos": "https://dmc-repo.web.cern.ch/dmc-repo/el6/x86_64/",
             "packages": [
                {
                   "src": "https://diracos.web.cern.ch/diracos/SRPM/epydoc-3.0.1-6.el6.src.rpm",
@@ -536,7 +539,7 @@
                   "buildOnly": true
                },
                {
-                  "src": "https://dmc-repo.web.cern.ch/dmc-repo/testing/el7/x86_64/gfal2-2.19.0-r2101141321.el7.src.rpm",
+                  "src": "https://dmc-repo.web.cern.ch/dmc-repo/rc/el6/x86_64/gfal2-2.19.0-1.el6.src.rpm",
                   "originalRepo": "https://dl.fedoraproject.org/pub/epel/6/SRPMS/Packages/",
                   "excludePatterns": [
                      ".*-doc-.*",
@@ -546,11 +549,11 @@
                   "name": "gfal2"
                },
                {
-                  "src": "https://dmc-repo.web.cern.ch/dmc-repo/testing/el7/x86_64/gfal2-python-1.10.0-r2012301256.el7.src.rpm",
+                  "src": "https://dmc-repo.web.cern.ch/dmc-repo/rc/el6/x86_64/gfal2-python-1.10.0-1.el6.src.rpm",
                   "name": "gfal2-python"
                },
                {
-                  "src": "https://dmc-repo.web.cern.ch/dmc-repo/testing/el7/x86_64/gfal2-util-1.6.0-r2101031543.el7.src.rpm",
+                  "src": "https://dmc-repo.web.cern.ch/dmc-repo/rc/el6/x86_64/gfal2-util-1.6.0-1.el6.src.rpm",
                   "name": "gfal2-util"
                }
             ]

diff --git a/routines/davix.py b/routines/davix.py
@@ -10,7 +10,7 @@
 
 # TODO: factorize with glite-ce-cream-cli.py, since it is essentialy the same thing
 
-CMAKE3_SLC6_INSTALLER = 'https://gitlab.cern.ch/dss/eos/-/raw/4.7.1/misc/slc6/cmake-3.15.5-Linux-x86_64.sh'
+CMAKE3_SLC6_INSTALLER = 'https://github.com/Kitware/CMake/releases/download/v3.19.3/cmake-3.19.3-Linux-x86_64.tar.gz'
 
 
 def execute(**kwargs):
@@ -25,7 +25,7 @@ def execute(**kwargs):
   mockRoot = kwargs['mockRoot']
   patchDir = kwargs['patchDir']
   patchFile = None
-  pkgList = kwargs['pkgList']
+
   workDir = kwargs.get('workDir', '/tmp')
 
   logging.info("Building %s %s", srpmFile, "%s" % ("with mockConfig %s" % mockConfig
@@ -68,12 +68,12 @@ def execute(**kwargs):
   installer = diracoslib._downloadFile(CMAKE3_SLC6_INSTALLER, workDir)
 
   mockUsrDir = os.path.join(mockRoot, 'root/usr/')
-  cmd = ['sh', installer, '--skip-license', '--prefix', mockUsrDir]
+  cmd = ['sh', installer, '--skip-license', '--prefix=%s' % mockUsrDir]
   logging.info("Installing cmake3 in the mock environment %s", cmd)
   subprocess.check_call(cmd)
 
   diracoslib._mockRebuild(srpmFile, mockConfig, noClean=True)
   mockResultDir = os.path.join(mockRoot, 'result/')
-  diracoslib._copyRPMs(mockResultDir, repository, byRPMType=True, pkgList=pkgList)
+  diracoslib._copyRPMs(mockResultDir, repository, byRPMType=True)
   diracoslib._createRepo(repository)
   logging.info('Finished')