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 eae7bd35be3d98ebf42e1025579ffc7029bc061d Author: Chandan Singh <[email protected]> AuthorDate: Thu Jan 14 23:46:30 2021 +0000 fixup! ci: Replace docker CLI monstrosity with Compose --- .github/compose/ci.docker-compose.yml | 4 ++++ .github/workflows/ci.yml | 37 +---------------------------------- 2 files changed, 5 insertions(+), 36 deletions(-) diff --git a/.github/compose/ci.docker-compose.yml b/.github/compose/ci.docker-compose.yml index 9ef9477..8c5ef8b 100644 --- a/.github/compose/ci.docker-compose.yml +++ b/.github/compose/ci.docker-compose.yml @@ -35,6 +35,10 @@ services: <<: *tests-template image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-centos:7.7.1908-${CI_IMAGE_VERSION:-latest} + fedora-missing-deps: + <<: *tests-template + image: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:minimal-${CI_IMAGE_VERSION:-latest} + no-usedevelop: <<: *tests-template environment: diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8ea51bf..f770df5 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: @@ -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"
