Benjamin Schubert pushed to branch bschubert/add-fedora-nobwrap-tests at BuildStream / buildstream
Commits:
- 
23b7858b
by Benjamin Schubert at 2018-11-09T17:30:28Z
- 
4cec597a
by Benjamin Schubert at 2018-11-09T17:31:09Z
1 changed file:
Changes:
| ... | ... | @@ -56,6 +56,8 @@ source_dist: | 
| 56 | 56 |    stage: test
 | 
| 57 | 57 |    variables:
 | 
| 58 | 58 |      PYTEST_ADDOPTS: "--color=yes"
 | 
| 59 | +    INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache"
 | |
| 60 | + | |
| 59 | 61 |    script:
 | 
| 60 | 62 |    # Diagnostics
 | 
| 61 | 63 |    - mount
 | 
| ... | ... | @@ -64,8 +66,6 @@ source_dist: | 
| 64 | 66 |    - useradd -Um buildstream
 | 
| 65 | 67 |    - chown -R buildstream:buildstream .
 | 
| 66 | 68 |  | 
| 67 | -  - export INTEGRATION_CACHE="$(pwd)/cache/integration-cache"
 | |
| 68 | - | |
| 69 | 69 |    # Unpack and get into dist/buildstream
 | 
| 70 | 70 |    - cd dist && ./unpack.sh
 | 
| 71 | 71 |    - chown -R buildstream:buildstream buildstream
 | 
| ... | ... | @@ -109,9 +109,11 @@ tests-unix: | 
| 109 | 109 |    variables:
 | 
| 110 | 110 |      BST_FORCE_BACKEND: "unix"
 | 
| 111 | 111 |      PYTEST_ADDOPTS: "--color=yes"
 | 
| 112 | +    INTEGRATION_CACHE: "${CI_PROJECT_DIR}/cache/integration-cache"
 | |
| 112 | 113 |    script:
 | 
| 113 | 114 |  | 
| 114 | -    - export INTEGRATION_CACHE="$(pwd)/cache/integration-cache"
 | |
| 115 | +    - echo $CI_PROJECT_DIR
 | |
| 116 | +    - echo $(pwd)
 | |
| 115 | 117 |  | 
| 116 | 118 |      # We remove the Bubblewrap and OSTree packages here so that we catch any
 | 
| 117 | 119 |      # codepaths that try to use them. Removing OSTree causes fuse-libs to
 | 
