This is an automated email from the ASF dual-hosted git repository.

juergbi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/buildstream.git


The following commit(s) were added to refs/heads/master by this push:
     new 421520765 .github: Run tests in fedora 36
     new d796c4e07 Merge pull request #1647 from jjardon/jjardon/f36
421520765 is described below

commit 421520765b56d1c4ff3e5b205f9fab41b37c2e35
Author: Javier Jardón <[email protected]>
AuthorDate: Sat May 7 18:15:15 2022 +0100

    .github: Run tests in fedora 36
    
    And remove soon to be deprecated fedora 34
---
 .github/common.env                    | 2 +-
 .github/compose/ci.docker-compose.yml | 8 ++++----
 .github/run-ci.sh                     | 2 +-
 .github/workflows/ci.yml              | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/common.env b/.github/common.env
index c9e44b1cc..2072f21ac 100644
--- a/.github/common.env
+++ b/.github/common.env
@@ -1,6 +1,6 @@
 # Shared common variables
 
-CI_IMAGE_VERSION=master-488745436
+CI_IMAGE_VERSION=master-533491591
 CI_TOXENV_MAIN=py37,py38-nocover,py39-nocover,py310-nocover
 
CI_TOXENV_PLUGINS=py37-plugins,py38-plugins-nocover,py39-plugins-nocover,py310-plugins-nocover
 CI_TOXENV_ALL="${CI_TOXENV_MAIN},${CI_TOXENV_PLUGINS}"
diff --git a/.github/compose/ci.docker-compose.yml 
b/.github/compose/ci.docker-compose.yml
index dacf6d565..83677af1e 100644
--- a/.github/compose/ci.docker-compose.yml
+++ b/.github/compose/ci.docker-compose.yml
@@ -22,14 +22,14 @@ x-tests-template: &tests-template
 
 services:
 
-  fedora-34:
-    <<: *tests-template
-    image: 
registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:34-${CI_IMAGE_VERSION:-latest}
-
   fedora-35:
     <<: *tests-template
     image: 
registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:35-${CI_IMAGE_VERSION:-latest}
 
+  fedora-36:
+    <<: *tests-template
+    image: 
registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:36-${CI_IMAGE_VERSION:-latest}
+
   debian-10:
     <<: *tests-template
     image: 
registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:10-${CI_IMAGE_VERSION:-latest}
diff --git a/.github/run-ci.sh b/.github/run-ci.sh
index c27352361..3227b32ac 100755
--- a/.github/run-ci.sh
+++ b/.github/run-ci.sh
@@ -102,7 +102,7 @@ function runServiceTest() {
 
 
 if [ -z "${test_names}" ]; then
-    for test_name in mypy debian-10 fedora-34 fedora-35 fedora-missing-deps; do
+    for test_name in mypy debian-10 fedora-35 fedora-36 fedora-missing-deps; do
        if ! runTest "${test_name}"; then
            echo "Tests failed"
            exit 1
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 583ba2af9..c3b3e4bfc 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -37,8 +37,8 @@ jobs:
         # "../compose/ci.docker-compose.yml"
         test-name:
           - debian-10
-          - fedora-34
           - fedora-35
+          - fedora-36
           - fedora-missing-deps
           - lint
           - mypy

Reply via email to