From 5b0c1e2af2a00c71e3dd609a1fc969c907d693bf Mon Sep 17 00:00:00 2001 From: Marko Petric Date: Thu, 3 Dec 2020 19:17:11 +0100 Subject: [PATCH 1/3] Use dedicated centos6 image to interact with vault repos --- .gitlab-ci.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3d571f7..b4d3fd2 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,13 +45,11 @@ compile: - DIRACOS except: - tags - image: centos:6 + image: diracgrid/centos6 script: - source ./docs/Tools/CreateName.sh - sed -i "2s/master/${BUILD_NAME}/" config/diracos.json - cp config/diracos.json changes/diracos.json - - yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm - - yum install -y mock rpm-build fedora-packager createrepo python-pip - export DIRACOS_REPO=/diracos_repo - mkdir -p $DIRACOS_REPO/i386 $DIRACOS_REPO/i686 $DIRACOS_REPO/src $DIRACOS_REPO/noarch $DIRACOS_REPO/x86_64 $DIRACOS_REPO/bootstrap $DIRACOS_REPO/buildOnly - curl -o $DIRACOS_REPO/bootstrap/lbzip2-2.5-2.el6.x86_64.rpm -L https://diracos.web.cern.ch/diracos/bootstrap/lbzip2-2.5-2.el6.x86_64.rpm From d30cb68ee27db7199f22316f3e54b249b8ad43f4 Mon Sep 17 00:00:00 2001 From: Marko Petric Date: Thu, 3 Dec 2020 20:29:34 +0100 Subject: [PATCH 2/3] Update repos to use centos vault and fedora archive --- .gitlab-ci.yml | 8 ++-- config/diracos.json | 6 +-- mockConfigs/epel-6-i386.cfg | 61 +++++++++++++++++++++++++ mockConfigs/epel-6-x86_64.cfg | 67 ++++++++++++++++++++++++++++ mockConfigs/mock-build-diracos.cfg | 6 +-- mockConfigs/mock-install-diracos.cfg | 6 +-- 6 files changed, 141 insertions(+), 13 deletions(-) create mode 100644 mockConfigs/epel-6-i386.cfg create mode 100644 mockConfigs/epel-6-x86_64.cfg diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b4d3fd2..25bc013 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -88,7 +88,7 @@ check_links: - docker except: - tags - image: cern/slc6-base + image: diracgrid/centos6 before_script: - yum install tar -y script: @@ -107,7 +107,7 @@ check_dependencies: - docker except: - tags - image: cern/slc6-base + image: diracgrid/centos6 before_script: - yum install tar -y script: @@ -137,7 +137,7 @@ check_dependencies: SLC6: extends: .run_test - image: cern/slc6-base + image: diracgrid/centos6 before_script: # graphical libraries needed for rrdtool - yum install -y tar freetype fontconfig pixman libXrender @@ -271,7 +271,7 @@ integration_tests_cc7: dyn_SLC6: extends: .run_dyn_test - image: cern/slc6-base + image: diracgrid/centos6 before_script: # graphical libraries needed for rrdtool - yum install -y tar freetype fontconfig pixman libXrender unzip diff --git a/config/diracos.json b/config/diracos.json index 4801d01..2998d40 100644 --- a/config/diracos.json +++ b/config/diracos.json @@ -18,20 +18,20 @@ "packages": [ { "src": "python", - "mockConfig": "epel-6-x86_64", + "mockConfig": "../mockConfigs/epel-6-x86_64.cfg", "name": "python", "branch": "f24" }, { "mockRoot": "/var/lib/mock/epel-6-i386", "src": "python", - "mockConfig": "epel-6-i386", + "mockConfig": "../mockConfigs/epel-6-i386", "name": "python-i386", "branch": "f24" }, { "src": "gdb", - "mockConfig": "epel-6-x86_64", + "mockConfig": "../mockConfigs/epel-6-x86_64.cfg", "name": "gdb", "postRoutine": "bootstrap-mock.py", "buildOnly": true, diff --git a/mockConfigs/epel-6-i386.cfg b/mockConfigs/epel-6-i386.cfg new file mode 100644 index 0000000..c59fab3 --- /dev/null +++ b/mockConfigs/epel-6-i386.cfg @@ -0,0 +1,61 @@ +# beware: RHEL use 6Server or 6Client +config_opts['releasever'] = '6' + +config_opts['yum.conf'] = """ +[main] +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= +mdpolicy=group:primary +best=1 + +# repos +[base] +name=BaseOS +enabled=1 +baseurl=https://vault.centos.org/6.10/os/i386/ +failovermethod=priority +gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-6 +gpgcheck=0 + +[updates] +name=updates +enabled=1 +baseurl=https://vault.centos.org/6.10/updates/i386/ +failovermethod=priority +gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-6 +gpgcheck=0 + +[epel] +name=epel +enabled=1 +baseurl=https://archives.fedoraproject.org/pub/archive/epel/6/i386/ +failovermethod=priority +gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-6 +gpgcheck=0 + +[testing] +name=epel-testing +enabled=0 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=i386 +failovermethod=priority + +[local] +name=local +baseurl=https://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/i386/ +cost=2000 +enabled=0 + +[epel-debuginfo] +name=epel-debug +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-6&arch=i386 +failovermethod=priority +enabled=0 +""" diff --git a/mockConfigs/epel-6-x86_64.cfg b/mockConfigs/epel-6-x86_64.cfg new file mode 100644 index 0000000..bcf5138 --- /dev/null +++ b/mockConfigs/epel-6-x86_64.cfg @@ -0,0 +1,67 @@ +config_opts['root'] = 'epel-6-x86_64' +config_opts['target_arch'] = 'x86_64' +config_opts['legal_host_arches'] = ('x86_64',) +config_opts['chroot_setup_cmd'] = 'install @buildsys-build' +config_opts['dist'] = 'el6' # only useful for --resultdir variable subst +# beware RHEL use 6Server or 6Client +config_opts['releasever'] = '6' + +config_opts['yum.conf'] = """ +[main] +keepcache=1 +debuglevel=2 +reposdir=/dev/null +logfile=/var/log/yum.log +retries=20 +obsoletes=1 +gpgcheck=0 +assumeyes=1 +syslog_ident=mock +syslog_device= +mdpolicy=group:primary +best=1 + +# repos +[base] +name=BaseOS +enabled=1 +baseurl=https://vault.centos.org/6.10/os/x86_64/ +failovermethod=priority +gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-6 +gpgcheck=0 + +[updates] +name=updates +enabled=1 +baseurl=https://vault.centos.org/6.10/updates/x86_64/ +failovermethod=priority +gpgkey=file:///usr/share/distribution-gpg-keys/centos/RPM-GPG-KEY-CentOS-6 +gpgcheck=0 + +[epel] +name=epel +enabled=1 +baseurl=https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/ +failovermethod=priority +gpgkey=file:///usr/share/distribution-gpg-keys/epel/RPM-GPG-KEY-EPEL-6 +gpgcheck=0 + +[testing] +name=epel-testing +enabled=0 +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=testing-epel6&arch=x86_64 +failovermethod=priority + +[local] +name=local +baseurl=https://kojipkgs.fedoraproject.org/repos/dist-6E-epel-build/latest/x86_64/ +cost=2000 +enabled=0 + +[epel-debuginfo] +name=epel-debug +mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-debug-6&arch=x86_64 +failovermethod=priority +enabled=0 +""" + diff --git a/mockConfigs/mock-build-diracos.cfg b/mockConfigs/mock-build-diracos.cfg index 6365f4e..12dffec 100644 --- a/mockConfigs/mock-build-diracos.cfg +++ b/mockConfigs/mock-build-diracos.cfg @@ -27,20 +27,20 @@ syslog_device= [base] name=BaseOS enabled=1 -baseurl=http://linuxsoft.cern.ch/cern/slc6X/x86_64/yum/os/ +baseurl=https://vault.centos.org/6.10/os/x86_64/ failovermethod=priority exclude=boost*,python*,PyXML*,firefox*,thunderbird* [updates] name=updates enabled=1 -baseurl=http://linuxsoft.cern.ch/cern/slc6X/x86_64/yum/updates/ +baseurl=https://vault.centos.org/6.10/updates/x86_64/ failovermethod=priority exclude=boost*,python*,PyXML*,firefox*,thunderbird* # MAYBE I NEED TO ADD PYTHON HERE BECAUSE OF pip and setuptools [epel] name=epel -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=x86_64 +baseurl=https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/ failovermethod=priority exclude=epel-release*,epel-rpm-macros*,gfal2*,globus*,firefox*,thunderbird* enabled=0 diff --git a/mockConfigs/mock-install-diracos.cfg b/mockConfigs/mock-install-diracos.cfg index e8b8e19..36d61cd 100644 --- a/mockConfigs/mock-install-diracos.cfg +++ b/mockConfigs/mock-install-diracos.cfg @@ -28,20 +28,20 @@ syslog_device= [base] name=BaseOS enabled=1 -baseurl=http://linuxsoft.cern.ch/cern/slc6X/x86_64/yum/os/ +baseurl=https://vault.centos.org/6.10/os/x86_64/ failovermethod=priority exclude=boost*,libxml*,python*,python-setuptools*,mysql*,libcurl*,curl*,firefox*,thunderbird* [updates] name=updates enabled=1 -baseurl=http://linuxsoft.cern.ch/cern/slc6X/x86_64/yum/updates/ +baseurl=https://vault.centos.org/6.10/updates/x86_64/ failovermethod=priority exclude=boost*,libxml*,python*,python-setuptools*,mysql*,libcurl*,curl*,yum-utils*,firefox*,thunderbird* # MAYBE I NEED TO ADD PYTHON HERE BECAUSE OF pip and setuptools [epel] name=epel -mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&arch=x86_64 +baseurl=https://archives.fedoraproject.org/pub/archive/epel/6/x86_64/ failovermethod=priority exclude=epel-release*,epel-rpm-macros*,gfal2*,globus*,glite*,xroot*,davix*,nordugrid*,firefox*,thunderbird* enabled=0 From c4cb3958358e626195d919d4723bf87c0a24db06 Mon Sep 17 00:00:00 2001 From: Marko Petric Date: Fri, 4 Dec 2020 16:22:43 +0100 Subject: [PATCH 3/3] Don't use pip 20.3 --- diracos/scriptTemplates/build_python_module_tpl.sh | 2 +- diracos/scriptTemplates/fix_pip_requirements_versions_tpl.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/diracos/scriptTemplates/build_python_module_tpl.sh b/diracos/scriptTemplates/build_python_module_tpl.sh index 40e59bd..e4958a3 100644 --- a/diracos/scriptTemplates/build_python_module_tpl.sh +++ b/diracos/scriptTemplates/build_python_module_tpl.sh @@ -30,7 +30,7 @@ source $PIP_DIRAC/bin/activate echo "Installing newer pip in virtualenv" cd /tmp curl -O -L https://bootstrap.pypa.io/get-pip.py -python get-pip.py +python get-pip.py pip==20.2.4 pip install -r /tmp/requirements.txt virtualenv --relocatable $PIP_DIRAC diff --git a/diracos/scriptTemplates/fix_pip_requirements_versions_tpl.sh b/diracos/scriptTemplates/fix_pip_requirements_versions_tpl.sh index 863d090..dbe4fb4 100644 --- a/diracos/scriptTemplates/fix_pip_requirements_versions_tpl.sh +++ b/diracos/scriptTemplates/fix_pip_requirements_versions_tpl.sh @@ -25,7 +25,7 @@ then echo "Installing pip" cd /tmp curl -O -L https://bootstrap.pypa.io/get-pip.py - python get-pip.py + python get-pip.py pip==20.2.4 echo "Installing pip-tools" pip install pip-tools @@ -103,4 +103,4 @@ if [ -z "$PIP_BUILD_DEPENDENCIES" ]; then echo "Removing conda" rm -rf /tmp/condaFixVersions -fi \ No newline at end of file +fi