diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 63e96a481a399060cb5120d743c48811a143d491..6a1f0dbd7b17a24c302ddbe9c63051a0b3a18101 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,21 +3,13 @@ variables: KOJI_TAG: 'dbclients' BUILD_6: 'False' BUILD_7: 'True' - BUILD_8: 'True' + BUILD_8: 'False' DIST_7: '.el7.cern' - DIST_8: '.el8.cern' # DO NOT MODIFY THIS include: 'https://gitlab.cern.ch/linuxsupport/rpmci/raw/master/rpm-ci.yml' # # DO NOT MODIFY THIS -.rpm_deps: +test_install7: before_script: - - if [ `rpm --eval %{dist}` == ".el8" ]; then yum-config-manager --add-repo "http://linuxsoft.cern.ch/internal/repos/dbclients8-stable/x86_64/os/"; fi - - yum-builddep -y *.spec - -.test_install: - before_script: - - if [ `rpm --eval %{dist}` == ".el8" ]; then yum-config-manager --add-repo "http://linuxsoft.cern.ch/internal/repos/dbclients8-stable/x86_64/os/"; fi - # test installing all binary meta packages except basiclite and compat, as these conflicts with 'basic' and 'devel' - - if [ `rpm --eval %{dist}` == ".el8" ]; then yum install -y --nogpgcheck `ls koji/*oracle-instantclient*x86_64.rpm |egrep -v 'basiclite|compat'`; else yum install -y --enablerepo=cernonly,cernonly-testing `ls koji/*oracle-instantclient*x86_64.rpm |egrep -v 'basiclite|compat'`; fi + - yum install -y --enablerepo=cernonly,cernonly-testing `ls koji/*oracle-instantclient*x86_64.rpm |egrep -v 'basiclite|compat'`