You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@buildstream.apache.org by ch...@apache.org on 2021/01/14 23:54:51 UTC
[buildstream] branch chandan/test updated (eae7bd3 -> c335197)
This is an automated email from the ASF dual-hosted git repository.
chandan pushed a change to branch chandan/test
in repository https://gitbox.apache.org/repos/asf/buildstream.git.
discard eae7bd3 fixup! ci: Replace docker CLI monstrosity with Compose
new c335197 fixup! ci: Replace docker CLI monstrosity with Compose
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (eae7bd3)
\
N -- N -- N refs/heads/chandan/test (c335197)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.github/compose/ci.docker-compose.yml | 3 +++
.github/workflows/ci.yml | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
[buildstream] 01/01: fixup! ci: Replace docker CLI monstrosity with
Compose
Posted by ch...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
chandan pushed a commit to branch chandan/test
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit c33519739fc2203b9229a7ded56a19090a014667
Author: Chandan Singh <ch...@chandansingh.net>
AuthorDate: Thu Jan 14 23:46:30 2021 +0000
fixup! ci: Replace docker CLI monstrosity with Compose
---
.github/compose/ci.docker-compose.yml | 7 +++++++
.github/workflows/ci.yml | 39 ++---------------------------------
2 files changed, 9 insertions(+), 37 deletions(-)
diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml
index 9ef9477..8d476a2 100644
--- a/.github/compose/ci.docker-compose.yml
+++ b/.github/compose/ci.docker-compose.yml
@@ -35,11 +35,18 @@ services:
<<: *tests-template
image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-centos:7.7.1908-${CI_IMAGE_VERSION:-latest}
+ # Ensure that tests also pass in the absence of a sandboxing tool
+ fedora-missing-deps:
+ <<: *tests-template
+ image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:minimal-${CI_IMAGE_VERSION:-latest}
+
+ # Ensure that tests also pass without `--develop` flag
no-usedevelop:
<<: *tests-template
environment:
TOXENV: py36-nocover,py37-nocover,py38-nocover
+ # Test the master version of external plugins
plugins-master:
<<: *tests-template
environment:
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8ea51bf..c811486 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,20 +33,13 @@ on:
# - standardize WSL tasks by using GitHub-provided runners
env:
- CI_IMAGE_VERSION: master-240510553
+ CI_IMAGE_VERSION: master-241289109
jobs:
tests:
runs-on: ubuntu-20.04
continue-on-error: ${{ matrix.allow-failure || false }}
- env:
- CI_IMAGE_PREFIX: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite
- CI_IMAGE_SUFFIX: master-177137613
- TOXENV: py36,py37,py38-nocover,py36-plugins,py37-plugins,py38-plugins-nocover
- # FIXME: De-duplicate against tox.ini
- BST_PLUGINS_EXPERIMENTAL_VERSION: 1.93.4
-
strategy:
fail-fast: false
matrix:
@@ -59,12 +52,12 @@ jobs:
- fedora-32
- ubuntu-18.04
- centos-7.7.1908
+ - fedora-missing-deps
- no-usedevelop
- lint
- mypy
include:
- # Test the master version of some external plugins
- test-name: plugins-master
allow-failure: true
@@ -87,8 +80,6 @@ jobs:
docs:
runs-on: ubuntu-20.04
- env:
- BST_FORCE_SESSION_REBUILD: 1
steps:
- name: Check out repository
uses: actions/checkout@v2
@@ -111,29 +102,3 @@ jobs:
with:
name: docs
path: doc/build/html
-
- # TODO: Consolidate with rest of the Docker Compose setup.
- # Providing a base image with the dependencies not added in the first place
- # should make that simpler.
- tests-fedora-missing-deps:
- runs-on: ubuntu-20.04
- container: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:32-master-177137613
- steps:
- - name: Check out repository
- uses: actions/checkout@v2
- # BuildStream requires tags to be able to find its version.
- with:
- fetch-depth: 0
- - name: Uninstall Bubblewrap and OSTree
- # We remove the Bubblewrap and OSTree packages here so that we catch any
- # codepaths that try to use them. Removing OSTree causes fuse-libs to
- # disappear unless we mark it as user-installed.
- run: |
- dnf mark install fuse-libs systemd-udev
- dnf erase -y bubblewrap ostree
- - name: Add test user
- run: |
- useradd -Um buildstream
- chown -R buildstream:buildstream .
- - name: Run tests
- run: su buildstream -c "tox -- $PYTEST_ARGS"