From e5afbd7eb2cac387ec772b27a57c03769c0f5fd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrg=20Billeter?= <j@bitron.ch>
Date: Wed, 12 Aug 2020 17:26:49 +0200
Subject: .gitlab-ci.yml: Add Fedora 32

Test coverage is not available yet with Python 3.8 (#1173).
---
 .gitlab-ci.yml | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e00362f2..4b02e11ae 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -25,7 +25,7 @@ variables:
   # Our own variables
   # Version of the docker images we should use for all the images.
   # This is taken from buildstream/buildstream-docker-images
-  DOCKER_IMAGE_VERSION: master-172648960
+  DOCKER_IMAGE_VERSION: master-177137613
   PYTEST_ADDOPTS: "--color=yes"
   INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache"
   PYTEST_ARGS: "--color=yes --integration -n 2"
@@ -72,6 +72,10 @@ tests-fedora-31:
   image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:31-${DOCKER_IMAGE_VERSION}
   <<: *tests
 
+tests-fedora-32:
+  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:32-${DOCKER_IMAGE_VERSION}
+  <<: *tests
+
 tests-ubuntu-18.04:
   image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-ubuntu:18.04-${DOCKER_IMAGE_VERSION}
   <<: *tests
@@ -135,7 +139,7 @@ tests-userchroot:
 
 tests-fedora-missing-deps:
   # Ensure that tests behave nicely while missing bwrap and ostree
-  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:31-${DOCKER_IMAGE_VERSION}
+  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:32-${DOCKER_IMAGE_VERSION}
   <<: *tests
 
   script:
@@ -155,7 +159,7 @@ tests-fedora-update-deps:
   # Check if the tests pass after updating requirements to their latest
   # allowed version.
   allow_failure: true
-  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:31-${DOCKER_IMAGE_VERSION}
+  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:32-${DOCKER_IMAGE_VERSION}
   <<: *tests
 
   script:
@@ -169,7 +173,7 @@ tests-fedora-update-deps:
 
 .compose-test-boilerplate: &remote-test
   allow_failure: true
-  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:31-${DOCKER_IMAGE_VERSION}
+  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:32-${DOCKER_IMAGE_VERSION}
   before_script:
     - dnf install -y docker docker-compose
     - docker-compose --file ${COMPOSE_MANIFEST} up --detach
@@ -208,7 +212,7 @@ tests-remote-cache:
 
 tests-no-usedevelop:
   # Ensure that tests also pass without `--develop` flag.
-  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:31-${DOCKER_IMAGE_VERSION}
+  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:32-${DOCKER_IMAGE_VERSION}
   <<: *tests
   variables:
     TOXENV: py36-nocover,py37-nocover,py38-nocover
@@ -225,7 +229,7 @@ mypy:
 
 # Lint separately from testing
 lint:
-  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:31-${DOCKER_IMAGE_VERSION}
+  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:32-${DOCKER_IMAGE_VERSION}
   stage: test
 
   before_script:
@@ -326,7 +330,7 @@ docs:
 
 .overnight-tests: &overnight-tests-template
   stage: test
-  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:31-${DOCKER_IMAGE_VERSION}
+  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:32-${DOCKER_IMAGE_VERSION}
   variables:
     FD_SDK_REF: freedesktop-sdk-20.08beta.1-buildstream2
     BST_EXT_REF: 1.93.4
@@ -385,7 +389,7 @@ overnight-tests-no-cache:
 # These tests might be a bit more flaky since they randomize the order
 # They will also take longer to run. Hence run them only nightly
 overnight-randomized:
-  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:31-master-97748867
+  image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:32-${DOCKER_IMAGE_VERSION}
   <<: *tests
 
   script:
@@ -447,8 +451,6 @@ coverage:
   - tests-centos-7.7
   - tests-debian-10
   - tests-fedora-31
-  - tests-fedora-missing-deps
-  - tests-fedora-update-deps
   - tests-remote-execution
   - tests-ubuntu-18.04
   - tests-userchroot
-- 
cgit v1.2.1