From d44143b15a7581afbf85263c053ed6130df34eba Mon Sep 17 00:00:00 2001
From: Jamie Curnow <jc@jc21.com>
Date: Wed, 30 Jun 2021 13:14:27 +1000
Subject: [PATCH] Reduce ci artifacts

---
 Jenkinsfile              | 12 ++++++------
 scripts/ci/build-backend |  8 +++-----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index a7dffdc9..e4c06765 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -111,10 +111,6 @@ pipeline {
 					// Dumps to analyze later
 					sh 'mkdir -p debug'
 					sh 'docker-compose logs fullstack | gzip > debug/docker_fullstack.log.gz'
-					// Cypress videos and screenshot artifacts
-					dir(path: 'test/results') {
-						archiveArtifacts allowEmptyArchive: true, artifacts: '**/*', excludes: '**/*.xml'
-					}
 					junit 'test/results/junit/*'
 				}
 			}
@@ -139,8 +135,6 @@ pipeline {
 				dir(path: 'docs/.vuepress/dist') {
 					sh 'tar -czf ../../docs.tgz *'
 				}
-
-				archiveArtifacts(artifacts: 'docs/docs.tgz', allowEmptyArchive: false)
 			}
 		}
 		stage('MultiArch Build') {
@@ -221,11 +215,17 @@ pipeline {
 			sh 'figlet "SUCCESS"'
 		}
 		failure {
+			dir(path: 'test') {
+				archiveArtifacts allowEmptyArchive: true, artifacts: 'results/**/*', excludes: '**/*.xml'
+			}
 			archiveArtifacts(artifacts: 'debug/**.*', allowEmptyArchive: true)
 			juxtapose event: 'failure'
 			sh 'figlet "FAILURE"'
 		}
 		unstable {
+			dir(path: 'test') {
+				archiveArtifacts allowEmptyArchive: true, artifacts: 'results/**/*', excludes: '**/*.xml'
+			}
 			archiveArtifacts(artifacts: 'debug/**.*', allowEmptyArchive: true)
 			juxtapose event: 'unstable'
 			sh 'figlet "UNSTABLE"'
diff --git a/scripts/ci/build-backend b/scripts/ci/build-backend
index 283cf313..7f39085e 100755
--- a/scripts/ci/build-backend
+++ b/scripts/ci/build-backend
@@ -20,10 +20,10 @@ if [ "$BUILD_VERSION" = "" ]; then
 fi
 
 echo -e "${BLUE}❯ ${GREEN}build-backend:${RESET}"
-echo "  BUILD_COMMIT:  ${BUILD_COMMIT:-notset}"
+echo "  BUILD_COMMIT:  $BUILD_COMMIT"
 echo "  BUILD_DATE:    $BUILD_DATE"
 echo "  BUILD_VERSION: $BUILD_VERSION"
-echo "  CGO_ENABLED:   ${CGO_ENABLED:-not set}"
+echo "  CGO_ENABLED:   ${CGO_ENABLED:-}"
 echo "  GO111MODULE:   ${GO111MODULE:-}"
 echo "  GOPRIVATE:     ${GOPRIVATE:-}"
 echo "  GOPROXY:       ${GOPROXY:-}"
@@ -36,7 +36,7 @@ cleanup() {
 build_backend() {
 	echo -e "${BLUE}❯ ${CYAN}Building backend for ${YELLOW}${1}-${2} ...${RESET}"
 
-	FILENAME="nginxproxymanager-v${BUILD_VERSION}_${1}_${2}"
+	FILENAME="nginxproxymanager-${1}_${2}"
 	if [ "$1" = "windows" ]; then
 		FILENAME="${FILENAME}.exe"
 	fi
@@ -44,13 +44,11 @@ build_backend() {
 	docker run --rm \
 		-e BUILD_COMMIT="${BUILD_COMMIT:-notset}" \
 		-e BUILD_DATE="$BUILD_DATE" \
-		-e BUILD_VERSION="$BUILD_VERSION" \
 		-e GOARCH="${2}" \
 		-e GOOS="${1}" \
 		-e GOPRIVATE="${GOPRIVATE:-}" \
 		-e GOPROXY="${GOPROXY:-}" \
 		-e NOW="$NOW" \
-		-e SENTRY_DSN="${SENTRY_DSN:-}" \
 		-e TZ="${TZ:-Australia/Brisbane}" \
 		-v "$(pwd):/app" \
 		-w '/app/backend' \