summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTristan Maat <tristan.maat@codethink.co.uk>2017-11-20 15:12:06 +0000
committerTristan Maat <tristan.maat@codethink.co.uk>2017-11-20 15:37:11 +0000
commit1eb7f616f0a1fcaaa64d8699a22fee8db5af15f2 (patch)
treeb23c36052c24b9e6223b841f60142637a637ac32
parentb9418b495ca5b12953c97724d8c10f2ac8db5767 (diff)
downloadbuildstream-another-segfault.tar.gz
Only run the cmake testanother-segfault
-rw-r--r--.gitlab-ci.yml194
1 files changed, 97 insertions, 97 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 66674e839..59a222ec7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,19 +20,19 @@ before_script:
- adduser -m buildstream
- chown -R buildstream:buildstream .
-# 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/
+# # 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/
# 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,86 +56,86 @@ 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/
-
-# Collate coverage reports
-#
-coverage:
- stage: coverage
- script:
- - pip3 install --no-index .
- - mkdir report
- - cd report
- - cp ../coverage-linux/coverage.linux .coverage
- - cp ../coverage-unix/coverage.unix .
- - coverage combine --rcfile=../.coveragerc -a ../coverage-unix/coverage.unix
- - cp ../coverage-pytest/coverage.pytest .
- - coverage combine --rcfile=../.coveragerc -a coverage.pytest
- - cp ../coverage-pytest-unix/coverage.pytest-unix .
- - coverage combine --rcfile=../.coveragerc -a coverage.pytest-unix
- - coverage report --rcfile=../.coveragerc -m
- dependencies:
- - pytest
- - integration_linux
- - pytest_unix
- - integration_unix
-
-# Automatically build documentation, only for merges which land
-# on master branch.
-#
-# Note: We still do not enforce a consistent installation of python2
-# or sphinx, as python2 will significantly grow the backing image.
-#
-pages:
- stage: docs
- script:
- - dnf install -y python2
- - pip3 install sphinx
- - pip3 install sphinx-click
- - pip3 install --user .
- - make -C doc
- - mv doc/build/html public
- artifacts:
- paths:
- - public/
- only:
- - master
+# 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
+# #
+# coverage:
+# stage: coverage
+# script:
+# - pip3 install --no-index .
+# - mkdir report
+# - cd report
+# - cp ../coverage-linux/coverage.linux .coverage
+# - cp ../coverage-unix/coverage.unix .
+# - coverage combine --rcfile=../.coveragerc -a ../coverage-unix/coverage.unix
+# - cp ../coverage-pytest/coverage.pytest .
+# - coverage combine --rcfile=../.coveragerc -a coverage.pytest
+# - cp ../coverage-pytest-unix/coverage.pytest-unix .
+# - coverage combine --rcfile=../.coveragerc -a coverage.pytest-unix
+# - coverage report --rcfile=../.coveragerc -m
+# dependencies:
+# - pytest
+# - integration_linux
+# - pytest_unix
+# - integration_unix
+
+# # Automatically build documentation, only for merges which land
+# # on master branch.
+# #
+# # Note: We still do not enforce a consistent installation of python2
+# # or sphinx, as python2 will significantly grow the backing image.
+# #
+# pages:
+# stage: docs
+# script:
+# - dnf install -y python2
+# - pip3 install sphinx
+# - pip3 install sphinx-click
+# - pip3 install --user .
+# - make -C doc
+# - mv doc/build/html public
+# artifacts:
+# paths:
+# - public/
+# only:
+# - master