Skip to content

Commit

Permalink
ci: removed ui artifacts (#5400)
Browse files Browse the repository at this point in the history
This change removes the go mod download process for the UI tests, removes the commented out code block that once called the UI tests, and the duplicate web/wasm build step. The Build step for the web/wasm is now executed via a shell script and called much earlier in the tests.
  • Loading branch information
neo-cypher committed Dec 12, 2022
1 parent c575a21 commit 9671851
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 59 deletions.
1 change: 0 additions & 1 deletion Jenkinsfile.premerge
Expand Up @@ -31,7 +31,6 @@ pipeline {

// download dependencies
sh 'go mod download'
sh 'cd testsuite/ui && go mod download'

// pre-check that we cannot do at a later stage reliably
sh 'check-large-files'
Expand Down
48 changes: 0 additions & 48 deletions Jenkinsfile.public
Expand Up @@ -31,7 +31,6 @@ pipeline {

// download dependencies
sh 'go mod download'
sh 'cd testsuite/ui && go mod download'

// pre-check that we cannot do at a later stage reliably
sh 'check-large-files'
Expand Down Expand Up @@ -134,16 +133,6 @@ pipeline {
sh 'make test-wasm-size'

sh 'protolock status'

dir("testsuite/ui") {
sh 'check-imports ./...'
sh 'check-atomic-align ./...'
sh 'check-monkit ./...'
sh 'check-errs ./...'
sh 'staticcheck ./...'
sh 'golangci-lint --config /go/ci/.golangci.yml -j=2 run'
}

sh './scripts/check-package-lock.sh'
}
}
Expand Down Expand Up @@ -292,43 +281,6 @@ pipeline {
sh 'cockroach sql --insecure --host=localhost:26257 -e \'drop database testcockroach5;\''
}
}


/*
stage('UI') {
when {
anyOf {
branch 'main'
branch pattern: "release-.*", comparator: "REGEXP"
changeset "testsuite/ui/**"
changeset "web/**"
changeset "satellite/console/**"
changeset "storagenode/console/**"
changeset "multinode/console/**"
}
}
environment {
STORJ_TEST_COCKROACH = 'omit'
STORJ_TEST_POSTGRES = 'postgres://postgres@localhost/testui?sslmode=disable'
STORJ_TEST_BROWSER = '/usr/bin/chromium'
STORJ_TEST_SATELLITE_WEB = "${pwd()}/web/satellite"
STORJ_TEST_EDGE_HOST = '127.0.0.10'
}
steps {
sh 'psql -U postgres -c \'create database testui;\''
catchError(buildResult: 'SUCCESS', stageResult: 'FAILURE') {
sh 'cd testsuite/ui && go test -parallel 1 -p 1 -short -vet=off -timeout 5m -json -race ./... 2>&1 | tee ../../.build/ui-tests.json | xunit -out ../../.build/ui-tests.xml'
}
}
post {
always {
archiveArtifacts artifacts: '.build/ui-tests.json'
sh script: 'cat .build/ui-tests.json | tparse -all -top -slow 100', returnStatus: true
junit '.build/ui-tests.xml'
}
}
}
*/
stage('Post') {
parallel {
stage('Lint') {
Expand Down
11 changes: 1 addition & 10 deletions Jenkinsfile.verify
Expand Up @@ -31,7 +31,7 @@ pipeline {

// download dependencies
sh 'go mod download'
sh 'cd testsuite/ui && go mod download'


// pre-check that we cannot do at a later stage reliably
sh 'check-large-files'
Expand Down Expand Up @@ -133,15 +133,6 @@ pipeline {

sh 'protolock status'

dir("testsuite/ui") {
sh 'check-imports ./...'
sh 'check-atomic-align ./...'
sh 'check-monkit ./...'
sh 'check-errs ./...'
sh 'staticcheck ./...'
sh 'golangci-lint --config /go/ci/.golangci.yml -j=2 run'
}

sh './scripts/check-package-lock.sh'
}
}
Expand Down

0 comments on commit 9671851

Please sign in to comment.