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

akitouni pushed a commit to branch abderrahim/test-ci
in repository https://gitbox.apache.org/repos/asf/buildstream.git

commit 571653cc56d0a89f4f9fa10afca6c0031717a812
Author: Abderrahim Kitouni <[email protected]>
AuthorDate: Sun Mar 20 18:27:59 2022 +0100

    test CI
---
 .github/compose/ci.docker-compose.yml |   2 +-
 .github/workflows/ci.yml              | 159 ++++++++++++++++++++--------------
 2 files changed, 96 insertions(+), 65 deletions(-)

diff --git a/.github/compose/ci.docker-compose.yml 
b/.github/compose/ci.docker-compose.yml
index dacf6d5..e4a1496 100644
--- a/.github/compose/ci.docker-compose.yml
+++ b/.github/compose/ci.docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.4'
 
 x-tests-template: &tests-template
     image: 
registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-fedora:35-${CI_IMAGE_VERSION:-latest}
-    command: tox -vvvvv -- --color=yes --integration
+    command: 
     environment:
       TOXENV: ${CI_TOXENV_ALL}
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7e8bee7..a0a7198 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -27,84 +27,115 @@ concurrency:
 jobs:
   tests:
     runs-on: ubuntu-20.04
+    container:
+      image: 
registry.gitlab.com/buildstream/buildstream-docker-images/testsuite-${{matrix.test-name}}-abderrahim-no-testuser-500677583
+      options: --privileged --device=/dev/fuse:/dev/fuse
+
     continue-on-error: ${{ matrix.allow-failure || false }}
 
     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-34
-          - fedora-35
-          - fedora-missing-deps
-          - lint
-          - mypy
-
-        include:
-          - test-name: plugins-master
-            allow-failure: true
+          - debian:10
+          - fedora:34
+          - fedora:35
+          - fedora:minimal
 
     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: |
-          ${GITHUB_WORKSPACE}/.github/run-ci.sh ${{ matrix.test-name }}
-
-  # Matrix of tests which run against remote services which we bring up 
adjacently
-  service-tests:
-    runs-on: ubuntu-20.04
-
-    strategy:
-      matrix:
+      - name: Give `testuser` ownership of the neccessary directories
+        run: sudo chown -R 1000:1000 ${GITHUB_WORKSPACE} ${HOME}
 
-        # The names here map to valid services defined in 
"../compose/ci.docker-compose.yml",
-        # and they also map to corresponding filenames of services which are 
expected
-        # to be run in the background
-        test-name:
-          - buildbarn
-          - buildgrid
-
-    steps:
       - name: Check out repository
         uses: actions/checkout@v2
         # BuildStream requires tags to be able to find its version.
         with:
           fetch-depth: 0
 
-      - name: Bring up the RE cluster
+      - name: Run tests
         run: |
-          ${GITHUB_WORKSPACE}/.github/run-ci.sh --service ${{ matrix.test-name 
}}
+          tox -vvvvv -- --color=yes --integration -n auto
+
+  # tests:
+  #   runs-on: ubuntu-20.04
+  #   continue-on-error: ${{ matrix.allow-failure || false }}
+
+  #   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-34
+  #         - fedora-35
+  #         - fedora-missing-deps
+  #         - lint
+  #         - mypy
+
+  #       include:
+  #         - 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: |
+  #         ${GITHUB_WORKSPACE}/.github/run-ci.sh ${{ matrix.test-name }}
 
-  docs:
-    runs-on: ubuntu-20.04
-    steps:
-      - name: Check out repository
-        uses: actions/checkout@v2
-        # BuildStream requires tags to be able to find its version.
-        with:
-          fetch-depth: 0
-
-      - name: Give `testuser` ownership of the source directory
-        run: sudo chown -R 1000:1000 ${GITHUB_WORKSPACE}
-
-      - name: Build documentation using Docker Compose
-        run: |
-          docker-compose \
-            --env-file ${GITHUB_WORKSPACE}/.github/common.env \
-            --file ${GITHUB_WORKSPACE}/.github/compose/ci.docker-compose.yml \
-            run \
-            docs
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v2
-        with:
-          name: docs
-          path: doc/build/html
+  # Matrix of tests which run against remote services which we bring up 
adjacently
+  # service-tests:
+  #   runs-on: ubuntu-20.04
+
+  #   strategy:
+  #     matrix:
+
+  #       # The names here map to valid services defined in 
"../compose/ci.docker-compose.yml",
+  #       # and they also map to corresponding filenames of services which are 
expected
+  #       # to be run in the background
+  #       test-name:
+  #         - buildbarn
+  #         - buildgrid
+
+  #   steps:
+  #     - name: Check out repository
+  #       uses: actions/checkout@v2
+  #       # BuildStream requires tags to be able to find its version.
+  #       with:
+  #         fetch-depth: 0
+
+  #     - name: Bring up the RE cluster
+  #       run: |
+  #         ${GITHUB_WORKSPACE}/.github/run-ci.sh --service ${{ 
matrix.test-name }}
+
+  # docs:
+  #   runs-on: ubuntu-20.04
+  #   steps:
+  #     - name: Check out repository
+  #       uses: actions/checkout@v2
+  #       # BuildStream requires tags to be able to find its version.
+  #       with:
+  #         fetch-depth: 0
+
+  #     - name: Give `testuser` ownership of the source directory
+  #       run: sudo chown -R 1000:1000 ${GITHUB_WORKSPACE}
+
+  #     - name: Build documentation using Docker Compose
+  #       run: |
+  #         docker-compose \
+  #           --env-file ${GITHUB_WORKSPACE}/.github/common.env \
+  #           --file ${GITHUB_WORKSPACE}/.github/compose/ci.docker-compose.yml 
\
+  #           run \
+  #           docs
+
+  #     - name: Upload artifacts
+  #       uses: actions/upload-artifact@v2
+  #       with:
+  #         name: docs
+  #         path: doc/build/html

Reply via email to