Well, maybe if we just run the cmake-test...

1 files changed, 55 insertions, 55 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 66674e839..58faf1595 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -22,17 +22,17 @@ before_script:
 
 # Run premerge commits
 #
-pytest:
-  stage: test
-  script:
-  # We run as a simple user to test for permission issues
-  - su buildstream -c 'python3 setup.py test --index-url invalid://uri'
-
-  - mkdir -p coverage-pytest/
-  - cp .coverage.* coverage-pytest/coverage.pytest
-  artifacts:
-    paths:
-    - coverage-pytest/
+# pytest:
+#   stage: test
+#   script:
+#   # We run as a simple user to test for permission issues
+#   - su buildstream -c 'python3 setup.py test --index-url invalid://uri'
+
+#   - mkdir -p coverage-pytest/
+#   - cp .coverage.* coverage-pytest/coverage.pytest
+#   artifacts:
+#     paths:
+#     - coverage-pytest/
 
 # Run integration tests
 #
@@ -44,7 +44,7 @@ integration_linux:
     - cd integration-tests
 
     # We run as a simple user to test for permission issues
-    - su buildstream -c './run-test.sh --arg --colors --cov ../.coveragerc --sources ${XDG_CACHE_HOME}/buildstream/sources test'
+    - su buildstream -c './run-test.sh --arg --colors --cov ../.coveragerc --sources ${XDG_CACHE_HOME}/buildstream/sources test cmake-test'
 
     - cd ..
     - mkdir -p coverage-linux/
@@ -56,46 +56,46 @@ integration_linux:
     - coverage-linux/
     - logs-linux/
 
-pytest_unix:
-  stage: test
-  variables:
-    BST_FORCE_BACKEND: "unix"
-  script:
-    # 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.
-    - dnf mark install fuse-libs
-    - dnf erase -y bubblewrap ostree
-
-    # Since the unix platform is required to run as root, no user change required
-    - python3 setup.py test --index-url invalid://uri
-
-    - mkdir -p coverage-pytest-unix
-    - cp .coverage.* coverage-pytest-unix/coverage.pytest-unix
-  artifacts:
-    paths:
-      - coverage-pytest-unix/
-
-integration_unix:
-  stage: test
-  variables:
-    BST_FORCE_BACKEND: "unix"
-  script:
-    - pip3 install --no-index .
-    - cd integration-tests
-
-    # Since the unix platform is required to run as root, no user change required
-    - ./run-test.sh --arg --colors --cov ../.coveragerc --sources ${XDG_CACHE_HOME}/buildstream/sources test
-
-    - cd ..
-    - mkdir -p coverage-unix/
-    - cp integration-tests/.coverage coverage-unix/coverage.unix
-    - cp -a integration-tests/tmp/logs logs-unix
-
-  artifacts:
-    paths:
-    - coverage-unix/
-    - logs-unix/
+# pytest_unix:
+#   stage: test
+#   variables:
+#     BST_FORCE_BACKEND: "unix"
+#   script:
+#     # 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.
+#     - dnf mark install fuse-libs
+#     - dnf erase -y bubblewrap ostree
+
+#     # Since the unix platform is required to run as root, no user change required
+#     - python3 setup.py test --index-url invalid://uri
+
+#     - mkdir -p coverage-pytest-unix
+#     - cp .coverage.* coverage-pytest-unix/coverage.pytest-unix
+#   artifacts:
+#     paths:
+#       - coverage-pytest-unix/
+
+# integration_unix:
+#   stage: test
+#   variables:
+#     BST_FORCE_BACKEND: "unix"
+#   script:
+#     - pip3 install --no-index .
+#     - cd integration-tests
+
+#     # Since the unix platform is required to run as root, no user change required
+#     - ./run-test.sh --arg --colors --cov ../.coveragerc --sources ${XDG_CACHE_HOME}/buildstream/sources test
+
+#     - cd ..
+#     - mkdir -p coverage-unix/
+#     - cp integration-tests/.coverage coverage-unix/coverage.unix
+#     - cp -a integration-tests/tmp/logs logs-unix
+
+#   artifacts:
+#     paths:
+#     - coverage-unix/
+#     - logs-unix/
 
 # Collate coverage reports
 #
@@ -114,10 +114,10 @@ coverage:
     - coverage combine --rcfile=../.coveragerc -a coverage.pytest-unix
     - coverage report --rcfile=../.coveragerc -m
   dependencies:
-  - pytest
+  # - pytest
   - integration_linux
-  - pytest_unix
-  - integration_unix
+  # - pytest_unix
+  # - integration_unix
 
 # Automatically build documentation, only for merges which land
 # on master branch.