| ... | ... | @@ -6,7 +6,6 @@ cache: | 
| 6 | 6 |      - cache/
 | 
| 7 | 7 |  
 | 
| 8 | 8 |  stages:
 | 
| 9 |  | -  - prepare
 | 
| 10 | 9 |    - test
 | 
| 11 | 10 |    - post
 | 
| 12 | 11 |  
 | 
| ... | ... | @@ -15,41 +14,6 @@ variables: | 
| 15 | 14 |    INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache"
 | 
| 16 | 15 |    TEST_COMMAND: "tox -- --color=yes --integration"
 | 
| 17 | 16 |  
 | 
| 18 |  | -#####################################################
 | 
| 19 |  | -#                  Prepare stage                    #
 | 
| 20 |  | -#####################################################
 | 
| 21 |  | -
 | 
| 22 |  | -# Create a source distribution
 | 
| 23 |  | -#
 | 
| 24 |  | -source_dist:
 | 
| 25 |  | -  stage: prepare
 | 
| 26 |  | -  script:
 | 
| 27 |  | -
 | 
| 28 |  | -  # Generate the source distribution tarball
 | 
| 29 |  | -  #
 | 
| 30 |  | -  - python3 setup.py sdist
 | 
| 31 |  | -  - tar -ztf dist/*
 | 
| 32 |  | -  - tarball=$(cd dist && echo $(ls *))
 | 
| 33 |  | -
 | 
| 34 |  | -  # Verify that the source distribution tarball can be installed correctly
 | 
| 35 |  | -  #
 | 
| 36 |  | -  - pip3 install dist/*.tar.gz
 | 
| 37 |  | -  - bst --version
 | 
| 38 |  | -
 | 
| 39 |  | -  # unpack tarball as `dist/buildstream` directory
 | 
| 40 |  | -  - |
 | 
| 41 |  | -    cat > dist/unpack.sh << EOF
 | 
| 42 |  | -    #!/bin/sh
 | 
| 43 |  | -    tar -zxf ${tarball}
 | 
| 44 |  | -    mv ${tarball%.tar.gz} buildstream
 | 
| 45 |  | -    EOF
 | 
| 46 |  | -
 | 
| 47 |  | -  # Make our helpers executable
 | 
| 48 |  | -  - chmod +x dist/unpack.sh
 | 
| 49 |  | -  artifacts:
 | 
| 50 |  | -    paths:
 | 
| 51 |  | -    - dist/
 | 
| 52 |  | -
 | 
| 53 | 17 |  
 | 
| 54 | 18 |  #####################################################
 | 
| 55 | 19 |  #                    Test stage                     #
 | 
| ... | ... | @@ -72,8 +36,7 @@ source_dist: | 
| 72 | 36 |    - useradd -Um buildstream
 | 
| 73 | 37 |    - chown -R buildstream:buildstream .
 | 
| 74 | 38 |  
 | 
| 75 |  | -  # Run the tests from the source distribution, We run as a simple
 | 
| 76 |  | -  # user to test for permission issues
 | 
|  | 39 | +  # Run the tests as a simple user to test for permission issues
 | 
| 77 | 40 |    - su buildstream -c "${TEST_COMMAND}"
 | 
| 78 | 41 |  
 | 
| 79 | 42 |    after_script:
 | 
| ... | ... | @@ -192,7 +155,8 @@ docs: | 
| 192 | 155 |      scheduler:
 | 
| 193 | 156 |        fetchers: 2
 | 
| 194 | 157 |      EOF
 | 
| 195 |  | -  - (cd dist && ./unpack.sh && cd buildstream && pip3 install .)
 | 
|  | 158 | +  - pip3 install -r requirements/requirements.txt -r requirements/plugin-requirements.txt
 | 
|  | 159 | +  - pip3 install --no-index .
 | 
| 196 | 160 |    - pip3 install --user -e ${BST_EXT_URL}@${BST_EXT_REF}#egg=bst_ext
 | 
| 197 | 161 |    - git clone https://gitlab.com/freedesktop-sdk/freedesktop-sdk.git
 | 
| 198 | 162 |    - git -C freedesktop-sdk checkout ${FD_SDK_REF}
 | 
| ... | ... | @@ -275,13 +239,12 @@ coverage: | 
| 275 | 239 |    stage: post
 | 
| 276 | 240 |    coverage: '/TOTAL +\d+ +\d+ +(\d+\.\d+)%/'
 | 
| 277 | 241 |    script:
 | 
| 278 |  | -    - cd dist && ./unpack.sh && cd buildstream
 | 
| 279 | 242 |      - pip3 install -r requirements/requirements.txt -r requirements/dev-requirements.txt
 | 
| 280 | 243 |      - pip3 install --no-index .
 | 
| 281 | 244 |      - mkdir report
 | 
| 282 | 245 |      - cd report
 | 
| 283 |  | -    - cp ../../../coverage-unix/coverage.* .
 | 
| 284 |  | -    - cp ../../../coverage-linux/coverage.* .
 | 
|  | 246 | +    - cp ../coverage-unix/coverage.* .
 | 
|  | 247 | +    - cp ../coverage-linux/coverage.* .
 | 
| 285 | 248 |      - ls coverage.*
 | 
| 286 | 249 |      - coverage combine --rcfile=../.coveragerc -a coverage.*
 | 
| 287 | 250 |      - coverage report --rcfile=../.coveragerc -m
 | 
| ... | ... | @@ -290,7 +253,6 @@ coverage: | 
| 290 | 253 |    - tests-fedora-27
 | 
| 291 | 254 |    - tests-fedora-28
 | 
| 292 | 255 |    - tests-unix
 | 
| 293 |  | -  - source_dist
 | 
| 294 | 256 |    except:
 | 
| 295 | 257 |    - schedules
 | 
| 296 | 258 |  
 | 
| ... | ... | @@ -299,7 +261,6 @@ coverage: | 
| 299 | 261 |  pages:
 | 
| 300 | 262 |    stage: post
 | 
| 301 | 263 |    dependencies:
 | 
| 302 |  | -  - source_dist
 | 
| 303 | 264 |    - docs
 | 
| 304 | 265 |    variables:
 | 
| 305 | 266 |      ACME_DIR: public/.well-known/acme-challenge
 |