jenkins UI fix (#4146)
* deleted curly bracket * deleted stage Verification * added close bracket for pipeline * bracket deleted again * new bracket added * make look according to good practices
This commit is contained in:
parent
d9741491a1
commit
70efbd9837
@ -31,44 +31,44 @@ pipeline {
|
||||
}
|
||||
|
||||
|
||||
stage('Verification') {
|
||||
stage('UI') {
|
||||
environment {
|
||||
STORJ_TEST_COCKROACH = 'cockroach://root@localhost:26256/testui?sslmode=disable'
|
||||
STORJ_TEST_POSTGRES = 'postgres://postgres@localhost/testui?sslmode=disable'
|
||||
STORJ_TEST_BROWSER = '/usr/bin/chromium'
|
||||
STORJ_TEST_SATELLITE_WEB = "${pwd()}/.build/satellite-web"
|
||||
|
||||
DISPLAY = ':99'
|
||||
}
|
||||
steps {
|
||||
sh 'cockroach sql --insecure --host=localhost:26256 -e \'create database testui;\''
|
||||
sh 'psql -U postgres -c \'create database testui;\''
|
||||
stage('UI') {
|
||||
environment {
|
||||
STORJ_TEST_COCKROACH = 'cockroach://root@localhost:26256/testui?sslmode=disable'
|
||||
STORJ_TEST_POSTGRES = 'postgres://postgres@localhost/testui?sslmode=disable'
|
||||
STORJ_TEST_BROWSER = '/usr/bin/chromium'
|
||||
STORJ_TEST_SATELLITE_WEB = "${pwd()}/.build/satellite-web"
|
||||
|
||||
sh 'cp -r ./web/satellite/ ${STORJ_TEST_SATELLITE_WEB}/'
|
||||
DISPLAY = ':99'
|
||||
}
|
||||
steps {
|
||||
sh 'cockroach sql --insecure --host=localhost:26256 -e \'create database testui;\''
|
||||
sh 'psql -U postgres -c \'create database testui;\''
|
||||
|
||||
// TODO: this is not quite correct
|
||||
sh 'mkdir ${STORJ_TEST_SATELLITE_WEB}/wasm'
|
||||
sh 'cp "$(go env GOROOT)/misc/wasm/wasm_exec.js" ${STORJ_TEST_SATELLITE_WEB}/wasm/wasm_exec.js'
|
||||
sh 'GOOS=js GOARCH=wasm go build -o ${STORJ_TEST_SATELLITE_WEB}/wasm/main.wasm storj.io/storj/satellite/console/wasm'
|
||||
sh 'cp -r ./web/satellite/ ${STORJ_TEST_SATELLITE_WEB}/'
|
||||
|
||||
sh 'cd .build/satellite-web && npm install'
|
||||
sh 'cd .build/satellite-web && npm run build'
|
||||
// TODO: this is not quite correct
|
||||
sh 'mkdir ${STORJ_TEST_SATELLITE_WEB}/wasm'
|
||||
sh 'cp "$(go env GOROOT)/misc/wasm/wasm_exec.js" ${STORJ_TEST_SATELLITE_WEB}/wasm/wasm_exec.js'
|
||||
sh 'GOOS=js GOARCH=wasm go build -o ${STORJ_TEST_SATELLITE_WEB}/wasm/main.wasm storj.io/storj/satellite/console/wasm'
|
||||
|
||||
sh 'Xvfb -ac :99 -screen 0 1280x1024x16 &'
|
||||
sh 'go test -vet=off -race -json ./integration/ui/... 2>&1 | tee .build/ui-tests.json | xunit -out .build/ui-tests.xml'
|
||||
}
|
||||
post {
|
||||
always {
|
||||
sh script: 'cat .build/ui-tests.json | tparse -all -top -slow 100', returnStatus: true
|
||||
archiveArtifacts artifacts: '.build/ui-tests.json'
|
||||
junit '.build/ui-tests.xml'
|
||||
}
|
||||
}
|
||||
sh 'cd .build/satellite-web && npm install'
|
||||
sh 'cd .build/satellite-web && npm run build'
|
||||
|
||||
sh 'Xvfb -ac :99 -screen 0 1280x1024x16 &'
|
||||
sh 'go test -vet=off -race -json ./integration/ui/... 2>&1 | tee .build/ui-tests.json | xunit -out .build/ui-tests.xml'
|
||||
}
|
||||
post {
|
||||
always {
|
||||
sh script: 'cat .build/ui-tests.json | tparse -all -top -slow 100', returnStatus: true
|
||||
archiveArtifacts artifacts: '.build/ui-tests.json'
|
||||
junit '.build/ui-tests.xml'
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
post {
|
||||
always {
|
||||
sh "chmod -R 777 ." // ensure Jenkins agent can delete the working directory
|
||||
|
Loading…
Reference in New Issue
Block a user