From f221d754a81c6f7192ebb2a4334a312bfc453d04 Mon Sep 17 00:00:00 2001 From: Eric Ball Date: Tue, 4 Jan 2022 13:47:08 -0800 Subject: [PATCH] Chore: Update sigul bridge and server hostnames Change-Id: I7d60d2444eedeb74d674ebe9bc433daa3bc6607b Signed-off-by: Eric Ball --- jenkins-config/global-vars-production.sh | 2 +- jenkins-config/global-vars-sandbox.sh | 2 +- .../managed-config-files/custom/sigul-config/content | 10 +++++----- .../sigul-config/customizedCredentialMappings.sandbox.yaml | 4 ++-- .../custom/sigul-config/customizedCredentialMappings.yaml | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh index bffb4ef..e50dcdb 100644 --- a/jenkins-config/global-vars-production.sh +++ b/jenkins-config/global-vars-production.sh @@ -8,7 +8,7 @@ NEXUS_URL=https://nexus.akraino.org REGISTRY_PORTS=10001 10002 10003 10004 RPM_REPO_URL=https://nexus3.akraino.org S3_BUCKET= -SIGUL_BRIDGE_IP=10.30.216.9 +SIGUL_BRIDGE_IP=199.204.45.55 SIGUL_KEY=akraino-release-2018 SILO=production SONAR_URL=https://sonar.akraino.org diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh index b0082f0..9bffb91 100644 --- a/jenkins-config/global-vars-sandbox.sh +++ b/jenkins-config/global-vars-sandbox.sh @@ -7,7 +7,7 @@ NEXUS_URL=https://nexus.akraino.org REGISTRY_PORTS=10001 10002 10003 10004 RPM_REPO_URL=https://nexus3.akraino.org S3_BUCKET= -SIGUL_BRIDGE_IP=10.30.216.9 +SIGUL_BRIDGE_IP=199.204.45.55 SIGUL_KEY=akraino-sandbox SILO=sandbox SONAR_URL=https://sonar.akraino.org diff --git a/jenkins-config/managed-config-files/custom/sigul-config/content b/jenkins-config/managed-config-files/custom/sigul-config/content index 4c65a52..fbfdbc9 100644 --- a/jenkins-config/managed-config-files/custom/sigul-config/content +++ b/jenkins-config/managed-config-files/custom/sigul-config/content @@ -1,14 +1,14 @@ [client] -bridge-hostname: vex-yul-akraino-ingress-1.ci.codeaurora.org +bridge-hostname: sigul-bridge-yul.linuxfoundation.org bridge-port: 44334 -client-cert-nickname: vex-yul-akraino-jenkins-prod-1.ci.codeaurora.org -server-hostname: pdx-wl-sigul-server-1.int.codeaurora.org -user-name: vex-yul-akraino-jenkins-prod-1.ci.codeaurora.org +client-cert-nickname: $SIGUL_CONFIG_USR +server-hostname: vex-yul-wl-sigul-server-1.dr.codeaurora.org +user-name: $SIGUL_CONFIG_USR [koji] [nss] nss-dir: /home/jenkins/sigul -nss-password: $SIGUL_NSS_PASS +nss-password: $SIGUL_CONFIG_PSW nss-min-tls: tls1.2 nss-max-tls: tls1.2 diff --git a/jenkins-config/managed-config-files/custom/sigul-config/customizedCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/custom/sigul-config/customizedCredentialMappings.sandbox.yaml index c44a4a3..37aea3a 100644 --- a/jenkins-config/managed-config-files/custom/sigul-config/customizedCredentialMappings.sandbox.yaml +++ b/jenkins-config/managed-config-files/custom/sigul-config/customizedCredentialMappings.sandbox.yaml @@ -1,4 +1,4 @@ --- customizedCredentialMappings: - - credentialsId: "sigul-nss-pass" - tokenKey: "SIGUL_NSS_PASS" + - credentialsId: "sigul-config-credentials" + tokenKey: "SIGUL_CONFIG" diff --git a/jenkins-config/managed-config-files/custom/sigul-config/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/sigul-config/customizedCredentialMappings.yaml index c44a4a3..37aea3a 100644 --- a/jenkins-config/managed-config-files/custom/sigul-config/customizedCredentialMappings.yaml +++ b/jenkins-config/managed-config-files/custom/sigul-config/customizedCredentialMappings.yaml @@ -1,4 +1,4 @@ --- customizedCredentialMappings: - - credentialsId: "sigul-nss-pass" - tokenKey: "SIGUL_NSS_PASS" + - credentialsId: "sigul-config-credentials" + tokenKey: "SIGUL_CONFIG" -- 2.16.6