diff options
| author | bst-marge-bot <marge-bot@buildstream.build> | 2020-04-05 11:26:53 +0000 |
|---|---|---|
| committer | bst-marge-bot <marge-bot@buildstream.build> | 2020-04-05 11:26:53 +0000 |
| commit | ec4a9fe9debb1d506a739f1b65748c8b612d7a09 (patch) | |
| tree | 34317979eb2b380f9d700f0541a3c6e38c9725d0 | |
| parent | 21601ee1227a27795e8fb661757e2fc5893fc4a9 (diff) | |
| parent | 0e1ede11c7a82443a49d9beba1f111f44c03287a (diff) | |
| download | buildstream-ec4a9fe9debb1d506a739f1b65748c8b612d7a09.tar.gz | |
Merge branch 'jjardon/bst-1-fedora-31' into 'bst-1'
bst-1: Add current stable fedora 31 for tests
See merge request BuildStream/buildstream!1853
| -rw-r--r-- | .gitlab-ci.yml | 12 | ||||
| -rw-r--r-- | buildstream/_ostree.py | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2f5fd8712..feb79fac0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -56,12 +56,12 @@ tests-debian-10: image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-debian:10-${DOCKER_IMAGE_VERSION} <<: *tests -tests-fedora-29: - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:29-master-55318540 +tests-fedora-30: + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:30-${DOCKER_IMAGE_VERSION} <<: *tests -tests-fedora-30: - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:30-master-55318540 +tests-fedora-31: + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:31-${DOCKER_IMAGE_VERSION} <<: *tests tests-ubuntu-18.04: @@ -84,7 +84,7 @@ tests-python-3.8-buster: tests-unix: # Use fedora here, to ensure that we # can get rid of ostree - this is not possible with debian-8 - image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:30-master-55318540 + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:31-${DOCKER_IMAGE_VERSION} <<: *tests variables: BST_FORCE_BACKEND: "unix" @@ -190,8 +190,8 @@ coverage: dependencies: - tests-debian-9 - tests-debian-10 - - tests-fedora-29 - tests-fedora-30 + - tests-fedora-31 - tests-ubuntu-18.04 - tests-unix except: diff --git a/buildstream/_ostree.py b/buildstream/_ostree.py index 5a4039f2f..a0c056293 100644 --- a/buildstream/_ostree.py +++ b/buildstream/_ostree.py @@ -271,6 +271,6 @@ def configure_remote(repo, remote, url, key_url=None): try: gfile = Gio.File.new_for_uri(key_url) stream = gfile.read() - repo.remote_gpg_import(remote, stream, None, 0, None) + repo.remote_gpg_import(remote, stream, None, None) except GLib.GError as e: raise OSTreeError("Failed to add gpg key from url '{}': {}".format(key_url, e.message)) from e |