From a16270dfcc59de08a90badcd20b6822e6b0a8fa5 Mon Sep 17 00:00:00 2001
From: Anton Iakimov <yakimant@gmail.com>
Date: Thu, 15 Aug 2024 16:55:10 +0200
Subject: [PATCH] ci: set proxy env differently

---
 ci/Jenkinsfile.linux     | 6 +-----
 ci/Jenkinsfile.linux-nix | 6 +-----
 ci/Jenkinsfile.macos     | 6 +-----
 ci/Jenkinsfile.windows   | 6 +-----
 4 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/ci/Jenkinsfile.linux b/ci/Jenkinsfile.linux
index e956d0d239..6230b052f9 100644
--- a/ci/Jenkinsfile.linux
+++ b/ci/Jenkinsfile.linux
@@ -42,11 +42,6 @@ pipeline {
       description: 'Decides whether the mocked status-keycard-go library is built.',
       defaultValue: false
     )
-    string(
-      name: 'STATUS_BUILD_PROXY_STAGE_NAME',
-      description: 'Defines the stage used to choose the correct Proxy API URL',
-      defaultValue: utils.isReleaseBuild() ? 'prod' : 'test'
-    )
   }
 
   options {
@@ -79,6 +74,7 @@ pipeline {
     /* Control output the filename */
     STATUS_CLIENT_APPIMAGE = "pkg/${utils.pkgFilename(ext: 'AppImage', arch: getArch())}"
     STATUS_CLIENT_TARBALL = "pkg/${utils.pkgFilename(ext: 'tar.gz', arch: getArch())}"
+    STATUS_BUILD_PROXY_STAGE_NAME = "${utils.isReleaseBuild() ? 'prod' : 'test'}"
   }
 
   stages {
diff --git a/ci/Jenkinsfile.linux-nix b/ci/Jenkinsfile.linux-nix
index a3975024a7..f986b234fd 100644
--- a/ci/Jenkinsfile.linux-nix
+++ b/ci/Jenkinsfile.linux-nix
@@ -34,11 +34,6 @@ pipeline {
       description: 'Decides whether the mocked status-keycard-go library is built.',
       defaultValue: false
     )
-    string(
-      name: 'STATUS_BUILD_PROXY_STAGE_NAME',
-      description: 'Defines the stage used to choose the correct Proxy API URL',
-      defaultValue: utils.isReleaseBuild() ? 'prod' : 'test'
-    )
   }
 
   options {
@@ -68,6 +63,7 @@ pipeline {
     /* Control output the filename */
     STATUS_CLIENT_APPIMAGE = "pkg/${utils.pkgFilename(ext: 'AppImage', arch: getArch())}"
     STATUS_CLIENT_TARBALL = "pkg/${utils.pkgFilename(ext: 'tar.gz', arch: getArch())}"
+    STATUS_BUILD_PROXY_STAGE_NAME = "${utils.isReleaseBuild() ? 'prod' : 'test'}"
   }
 
   stages {
diff --git a/ci/Jenkinsfile.macos b/ci/Jenkinsfile.macos
index 3034ec1901..3f87e8a1c4 100644
--- a/ci/Jenkinsfile.macos
+++ b/ci/Jenkinsfile.macos
@@ -41,11 +41,6 @@ pipeline {
       description: 'Select app entitlements. Squish requires extra entitlements.',
       choices: ['resources/Entitlements.plist', 'resources/Entitlements_squish.plist']
     )
-    string(
-      name: 'STATUS_BUILD_PROXY_STAGE_NAME',
-      description: 'Defines the stage used to choose the correct Proxy API URL',
-      defaultValue: utils.isReleaseBuild() ? 'prod' : 'test'
-    )
   }
 
   options {
@@ -80,6 +75,7 @@ pipeline {
     STATUS_CLIENT_DMG = "pkg/${utils.pkgFilename(ext: 'dmg', arch: getArch())}"
     /* Apple Team ID for Notarization */
     MACOS_NOTARIZE_TEAM_ID = "8B5X2M6H2Y"
+    STATUS_BUILD_PROXY_STAGE_NAME = "${utils.isReleaseBuild() ? 'prod' : 'test'}"
   }
 
   stages {
diff --git a/ci/Jenkinsfile.windows b/ci/Jenkinsfile.windows
index 2757cbdb29..4724609692 100644
--- a/ci/Jenkinsfile.windows
+++ b/ci/Jenkinsfile.windows
@@ -33,11 +33,6 @@ pipeline {
       description: 'Decides whether the mocked status-keycard-go library is built.',
       defaultValue: false
     )
-    string(
-      name: 'STATUS_BUILD_PROXY_STAGE_NAME',
-      description: 'Defines the stage used to choose the correct Proxy API URL',
-      defaultValue: utils.isReleaseBuild() ? 'prod' : 'test'
-    )
   }
 
   options {
@@ -73,6 +68,7 @@ pipeline {
     STATUS_CLIENT_7Z = "pkg/${utils.pkgFilename(ext: '7z', arch: getArch())}"
     /* RFC 3161 timestamping URL for DigiCert */
     WINDOWS_CODESIGN_TIMESTAMP_URL = 'http://timestamp.digicert.com'
+    STATUS_BUILD_PROXY_STAGE_NAME = "${utils.isReleaseBuild() ? 'prod' : 'test'}"
   }
 
   stages {