Skip to content

Commit

Permalink
Merge branch '3171-after_script-should-only-run-after-tests' into 'ma…
Browse files Browse the repository at this point in the history
…ster'

Resolve "`after_script` should only run after tests"

Closes NebulousLabs#3171

See merge request NebulousLabs/Sia!3172
  • Loading branch information
lukechampine committed Jul 18, 2018
2 parents 1266b93 + 0985041 commit a628116
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
9 changes: 5 additions & 4 deletions .gitlab-ci.yml
Expand Up @@ -10,9 +10,6 @@ before_script:
- cp -R $CI_PROJECT_DIR $GOPATH/src/gitlab.com/NebulousLabs/Sia
- cd $GOPATH/src/gitlab.com/NebulousLabs/Sia

after_script:
- cp -R /tmp/SiaTesting $CI_PROJECT_DIR/SiaTesting

lint:
stage: lint
script:
Expand All @@ -26,7 +23,9 @@ legacy-tests:
name: "SiaTesting-$CI_JOB_NAME"
paths:
- $CI_PROJECT_DIR/SiaTesting
script: make test-long pkgs="./node ./node/api ./node/api/server" run=.
script:
- make test-long pkgs="./node ./node/api ./node/api/server" run=.
- cp -R /tmp/SiaTesting $CI_PROJECT_DIR/SiaTesting

package-tests:
stage: test
Expand All @@ -36,6 +35,7 @@ package-tests:
- $CI_PROJECT_DIR/SiaTesting
script:
- make test-long run=. pkgs="./build ./cmd/siac ./cmd/siad ./compatibility ./crypto ./encoding ./modules ./modules/consensus ./modules/explorer ./modules/gateway ./modules/host ./modules/host/contractmanager ./modules/renter ./modules/renter/contractor ./modules/renter/hostdb ./modules/renter/hostdb/hosttree ./modules/renter/proto ./modules/miner ./modules/wallet ./modules/transactionpool ./persist ./sync ./types"
- cp -R /tmp/SiaTesting $CI_PROJECT_DIR/SiaTesting

integration-tests:
stage: test
Expand All @@ -45,6 +45,7 @@ integration-tests:
- $CI_PROJECT_DIR/SiaTesting
script:
- make test-long run=. pkgs="./siatest ./siatest/consensus ./siatest/renter ./siatest/wallet"
- cp -R /tmp/SiaTesting $CI_PROJECT_DIR/SiaTesting

deploy:
stage: deploy
Expand Down
3 changes: 2 additions & 1 deletion siatest/renter/renter_test.go
Expand Up @@ -2252,7 +2252,8 @@ func TestZeroByteFile(t *testing.T) {
Miners: 1,
Renters: 1,
}
tg, err := siatest.NewGroupFromTemplate(groupParams)
testDir := renterTestDir(t.Name())
tg, err := siatest.NewGroupFromTemplate(testDir, groupParams)
if err != nil {
t.Fatal("Failed to create group: ", err)
}
Expand Down

0 comments on commit a628116

Please sign in to comment.