Merge branch 'jjardon/update_distros' into 'master'

CI: update distros used to test

See merge request baserock/ybd!400

1 files changed, 22 insertions, 30 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 598d970..9797dd8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,10 +19,14 @@ stages:
 - test
 - deploy
 
+
+
 check_pep8:
   stage: pep8
   script: "pycodestyle --show-source --show-pep8 --exclude definitions"
 
+
+
 cache_keys_v1:
   stage: cache_keys
   variables:
@@ -47,6 +51,8 @@ cache_keys_v6:
   - echo ci.d9dec300a7cb2bc273dc6846e69a11b7f3ad304462f3a4c6ce8c5ab6ead11647 > expected.result
   - diff expected.result ybd.result
 
+
+
 check_release_notes:
   stage: release_notes
   variables:
@@ -58,8 +64,9 @@ check_release_notes:
     paths:
     - release-notes.txt
 
-check_build_debian_jessie:
-  image: debian:jessie
+
+
+.build_template: &build_definition
   stage: build
   variables:
     YBD_kbas_url: "false-url"
@@ -69,38 +76,21 @@ check_build_debian_jessie:
   only:
     - master
 
+check_build_debian_stretch:
+  image: debian:stretch
+  <<: *build_definition
+
 check_build_ubuntu_16.04:
   image: ubuntu:16.04
-  stage: build
-  variables:
-    YBD_kbas_url: "false-url"
-    YBD_check_definitions: "exit"
-  script:
-  - ./ybd.py definitions/systems/minimal-system-x86_64-generic.morph x86_64
-  only:
-    - master
+  <<: *build_definition
 
-check_build_ubuntu_17.04:
-  image: ubuntu:17.04
-  stage: build
-  variables:
-    YBD_kbas_url: "false-url"
-    YBD_check_definitions: "exit"
-  script:
-  - ./ybd.py definitions/systems/minimal-system-x86_64-generic.morph x86_64
-  only:
-    - master
+check_build_ubuntu_17.10:
+  image: ubuntu:17.10
+  <<: *build_definition
 
-check_build_fedora_25:
-  image: fedora:25
-  stage: build
-  variables:
-    YBD_kbas_url: "false-url"
-    YBD_check_definitions: "exit"
-  script:
-  - ./ybd.py definitions/systems/minimal-system-x86_64-generic.morph x86_64
-  only:
-    - master
+check_build_fedora_27:
+  image: fedora:27
+  <<: *build_definition
 
 check_build_kbas:
   stage: build
@@ -109,6 +99,8 @@ check_build_kbas:
   script:
   - ./ybd.py definitions/systems/minimal-system-x86_64-chroot.morph x86_64
 
+
+
 check_deploy:
   stage: deploy
   script: