From 5aa1ac0b506daddab34057657805efab9bca5e08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Fri, 9 Feb 2018 12:48:39 +0000
Subject: .gitlab-ci.yml: Use temaplate for build jobs

---
 .gitlab-ci.yml | 34 ++++++++--------------------------
 1 file changed, 8 insertions(+), 26 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 598d970..d4879d1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,8 +58,7 @@ 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 +68,21 @@ check_build_debian_jessie:
   only:
     - master
 
+check_build_debian_jessie:
+  image: debian:jessie
+  <<: *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
+  <<: *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
+  <<: *build_definition
 
 check_build_kbas:
   stage: build
-- 
cgit v1.2.1


From aae24a40536c93aefcca7ed4e800cdab5f6d135a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Fri, 9 Feb 2018 12:49:29 +0000
Subject: .gitlab-ci.yml: Test in current Fedora 27

Fedora25 is not supported upstream anymore
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4879d1..b755570 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -80,8 +80,8 @@ check_build_ubuntu_17.04:
   image: ubuntu:17.04
   <<: *build_definition
 
-check_build_fedora_25:
-  image: fedora:25
+check_build_fedora_27:
+  image: fedora:27
   <<: *build_definition
 
 check_build_kbas:
-- 
cgit v1.2.1


From dcfbecfd7eac8c32e4177c34acda9cbc5fc49bea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Fri, 9 Feb 2018 12:50:52 +0000
Subject: .gitlab-ci.yml: test in ubuntu_17.10 instead ubuntu_17.04

ubuntu_17.04 is not supported anymore upstream
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b755570..045d338 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -76,8 +76,8 @@ check_build_ubuntu_16.04:
   image: ubuntu:16.04
   <<: *build_definition
 
-check_build_ubuntu_17.04:
-  image: ubuntu:17.04
+check_build_ubuntu_17.10:
+  image: ubuntu:17.10
   <<: *build_definition
 
 check_build_fedora_27:
-- 
cgit v1.2.1


From dece8d01d0da022045660f5138912f6b49028619 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Fri, 9 Feb 2018 12:52:48 +0000
Subject: .gitlab-ci.yml: Test in Debian stretch intead Debian jessie

stretch is the new stable version
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 045d338..2f64c8b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,8 +68,8 @@ check_release_notes:
   only:
     - master
 
-check_build_debian_jessie:
-  image: debian:jessie
+check_build_debian_stretch:
+  image: debian:stretch
   <<: *build_definition
 
 check_build_ubuntu_16.04:
-- 
cgit v1.2.1


From d560e2302804d147fb615cb3eb711206b3a5a92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20Jard=C3=B3n?= <jjardon@gnome.org>
Date: Fri, 9 Feb 2018 13:01:31 +0000
Subject: .gitlab-ci.yml: Separate stages a little more for clarity

---
 .gitlab-ci.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2f64c8b..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,6 +64,8 @@ check_release_notes:
     paths:
     - release-notes.txt
 
+
+
 .build_template: &build_definition
   stage: build
   variables:
@@ -91,6 +99,8 @@ check_build_kbas:
   script:
   - ./ybd.py definitions/systems/minimal-system-x86_64-chroot.morph x86_64
 
+
+
 check_deploy:
   stage: deploy
   script:
-- 
cgit v1.2.1