From 9671851ef459607924f2502296a1623b4edd1f2b Mon Sep 17 00:00:00 2001 From: "Antonio Franco (He/Him)" Date: Mon, 12 Dec 2022 08:15:16 -0500 Subject: [PATCH] ci: removed ui artifacts (#5400) 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. --- Jenkinsfile.premerge | 1 - Jenkinsfile.public | 48 -------------------------------------------- Jenkinsfile.verify | 11 +--------- 3 files changed, 1 insertion(+), 59 deletions(-) diff --git a/Jenkinsfile.premerge b/Jenkinsfile.premerge index 413d1ef07..b19c0da1b 100644 --- a/Jenkinsfile.premerge +++ b/Jenkinsfile.premerge @@ -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' diff --git a/Jenkinsfile.public b/Jenkinsfile.public index ea6f5a16a..4a5254af8 100644 --- a/Jenkinsfile.public +++ b/Jenkinsfile.public @@ -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' @@ -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' } } @@ -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') { diff --git a/Jenkinsfile.verify b/Jenkinsfile.verify index 0b176340d..8aa08270a 100644 --- a/Jenkinsfile.verify +++ b/Jenkinsfile.verify @@ -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' @@ -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' } }