Chore: Update sigul bridge and server hostnames

Issue-ID: CIMAN-33
Signed-off-by: Kevin Sandi <ksandi@contractor.linuxfoundation.org>
Change-Id: I029f0760efaeef1b97528406cee6a2e5f67d14f3

diff --git a/jenkins-config/global-vars-production.sh b/jenkins-config/global-vars-production.sh
index 9f7a172..fbae64a 100644 (file)
--- a/jenkins-config/global-vars-production.sh
+++ b/jenkins-config/global-vars-production.sh
@@ -16,7 +16,7 @@ REGISTRY_PORTS=10001 10002 10003 10004
 RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org
 RELEASE_USERNAME=onap-release
 S3_BUCKET=
-SIGUL_BRIDGE_IP=10.30.104.3
+SIGUL_BRIDGE_IP=199.204.45.55
 SIGUL_KEY=onap-release-2020
 SILO=production
 SONAR_URL=https://sonar.onap.org

diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh
index 7247094..fca2be4 100644 (file)
--- a/jenkins-config/global-vars-sandbox.sh
+++ b/jenkins-config/global-vars-sandbox.sh
@@ -16,7 +16,7 @@ REGISTRY_PORTS=10001 10002 10003 10004
 RELEASE_EMAIL=collab-it+onap-release@linuxfoundation.org
 RELEASE_USERNAME=onap-release
 S3_BUCKET=
-SIGUL_BRIDGE_IP=10.30.104.3
+SIGUL_BRIDGE_IP=199.204.45.55
 SIGUL_KEY=onap-sandbox
 SILO=sandbox
 SONAR_URL=https://sonar.onap.org

diff --git a/jenkins-config/managed-config-files/custom/sigul-config/content b/jenkins-config/managed-config-files/custom/sigul-config/content
index 1f72482..fbfdbc9 100644 (file)
--- 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-ecomp-ingress-1.ci.codeaurora.org
+bridge-hostname: sigul-bridge-yul.linuxfoundation.org
 bridge-port: 44334
-client-cert-nickname: vex-yul-ecomp-jenkins-1.ci.codeaurora.org
-server-hostname: pdx-wl-sigul-server-1.int.codeaurora.org
-user-name: vex-yul-ecomp-jenkins-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 (file)
--- 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 (file)
--- 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"