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/12 21:56:07 UTC
[buildstream] 02/02: fixup! ci: Replace docker CLI monstrosity with
Compose
This is an automated email from the ASF dual-hosted git repository.
chandan pushed a commit to branch chandan/compose
in repository https://gitbox.apache.org/repos/asf/buildstream.git
commit 33423b969df226cf701a01c2c97d193e357a5596
Author: Chandan Singh <ch...@chandansingh.net>
AuthorDate: Tue Jan 12 21:53:46 2021 +0000
fixup! ci: Replace docker CLI monstrosity with Compose
---
.github/ci.env | 1 -
.github/workflows/ci.yml | 142 +++++++++++++++++++++++------------------------
2 files changed, 71 insertions(+), 72 deletions(-)
diff --git a/.github/ci.env b/.github/ci.env
index a1dbb49..e69de29 100644
--- a/.github/ci.env
+++ b/.github/ci.env
@@ -1 +0,0 @@
-CI_IMAGE_VERSION=master-240510553
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 01252ac..b5c42cd 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -33,56 +33,54 @@ on:
# - standardize WSL tasks by using GitHub-provided runners
env:
- CI_IMAGE: registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:32-master-177137613
- PYTEST_ARGS: --color=yes --integration
+ CI_IMAGE_VERSION: master-240510553
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:
-
- # The names here should map to a valid service defined in
- # "../compose/ci.docker-compose.yml"
- test-name:
- - debian-10
- - fedora-31
- - fedora-32
- - ubuntu-18.04
- - centos-7.7.1908
- - no-usedevelop
- - lint
- - mypy
-
- include:
- # Test the master version of some external plugins
- - test-name: plugins-master
- allow-failure: true
-
- steps:
- - name: Check out repository
- uses: actions/checkout@v2
- # BuildStream requires tags to be able to find its version.
- with:
- fetch-depth: 0
-
- - name: Run tests with Docker Compose
- run: |
- docker-compose \
- --env-file ${GITHUB_WORKSPACE}/.github/ci.env \
- --file ${GITHUB_WORKSPACE}/.github/compose/ci.docker-compose.yml \
- run \
- ${{ matrix.test-name }}
+ # 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:
+ #
+ # # The names here should map to a valid service defined in
+ # # "../compose/ci.docker-compose.yml"
+ # test-name:
+ # - debian-10
+ # - fedora-31
+ # - fedora-32
+ # - ubuntu-18.04
+ # - centos-7.7.1908
+ # - no-usedevelop
+ # - lint
+ # - mypy
+ #
+ # include:
+ # # Test the master version of some external plugins
+ # - test-name: plugins-master
+ # allow-failure: true
+ #
+ # steps:
+ # - name: Check out repository
+ # uses: actions/checkout@v2
+ # # BuildStream requires tags to be able to find its version.
+ # with:
+ # fetch-depth: 0
+ #
+ # - name: Run tests with Docker Compose
+ # run: |
+ # docker-compose \
+ # --file ${GITHUB_WORKSPACE}/.github/compose/ci.docker-compose.yml \
+ # run \
+ # ${{ matrix.test-name }}
docs:
runs-on: ubuntu-20.04
@@ -95,10 +93,12 @@ jobs:
with:
fetch-depth: 0
+ - name: Give `testuser` ownership of the source directory
+ run: chown -R 1000:1000 ${GITHUB_WORKSPACE}
+
- name: Build documentation using Docker Compose
run: |
docker-compose \
- --env-file ${GITHUB_WORKSPACE}/.github/ci.env \
--file ${GITHUB_WORKSPACE}/.github/compose/ci.docker-compose.yml \
run \
docs
@@ -112,25 +112,25 @@ jobs:
# 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"
+ # 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"