Merge branch 'alatiera/ci-2' into 'master'

CI: Minor extra tweaks

See merge request federicomenaquintero/bzip2!11

.gitlab-ci.yml

@@ -3,15 +3,16 @@
 variables:
   AMD64_DEBIAN_TESTING: debian:testing
   AMD64_UBUNTU_BIONIC: ubuntu:bionic
-  AMD64_FEDORA_LATEST: fedora:latest
-  AMD64_FEDORA_RAWHIDE: fedora:rawhide
+  AMD64_FEDORA_LATEST: 'registry.fedoraproject.org/fedora:30'
+  AMD64_FEDORA_RAWHIDE: 'registry.fedoraproject.org/fedora:rawhide'
   AMD64_OPENSUSE_LEAP: opensuse/leap
   AMD64_OPENSUSE_TUMBLEWEED: opensuse/tumbleweed
 
 stages:
   - test
 
-.test_bzip2_template: &bzip2_test
+.test:
+  stage: test
   script:
     - mkdir builddir && cd builddir
     - ../autogen.sh
@@ -26,46 +27,40 @@ stages:
       - 'config.log'
   
 debian:testing:
+  extends: '.test'
   image: $AMD64_DEBIAN_TESTING
-  stage: test
   before_script:
     - apt update -y
     - apt install -y gcc make automake libtool
-  <<: *bzip2_test
 
 ubuntu:bionic:
+  extends: '.test'
   image: $AMD64_UBUNTU_BIONIC
-  stage: test
   before_script:
     - apt update -y
     - apt install -y gcc make automake libtool
-  <<: *bzip2_test
 
 fedora:latest:
+  extends: '.test'
   image: $AMD64_FEDORA_LATEST
-  stage: test
   before_script:
     - dnf install -y gcc make automake libtool
-  <<: *bzip2_test
 
 fedora:rawhide:
+  extends: '.test'
   image: $AMD64_FEDORA_RAWHIDE
-  stage: test
   before_script:
     - dnf install -y gcc make automake libtool
   allow_failure: true
-  <<: *bzip2_test
 
 opensuse/leap:
+  extends: '.test'
   image: $AMD64_OPENSUSE_LEAP
-  stage: test
   before_script:
     - zypper install -y gcc make automake libtool
-  <<: *bzip2_test
 
 opensuse/tumbleweed:
+  extends: '.test'
   image: $AMD64_OPENSUSE_TUMBLEWEED
-  stage: test
   before_script:
     - zypper install -y gcc make automake libtool
-  <<: *bzip2_test