From: Anil Belur Date: Fri, 7 Jan 2022 05:47:01 +0000 (+1000) Subject: Chore: Update sigul bridge and server hostnames X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=0c14cbd87ca8dbe119fa4e04aab9b8aceab5177d;p=releng%2Fbuilder.git Chore: Update sigul bridge and server hostnames Issue-ID: https://jira.linuxfoundation.org/browse/RELENG-4076 Signed-off-by: Anil Belur Change-Id: I3cc51e53c6db2d8da32f9e929ce8a017f16f05ca --- diff --git a/jenkins-config/global-vars-releng.sh b/jenkins-config/global-vars-releng.sh index 1da2fd269..0623beb3f 100644 --- a/jenkins-config/global-vars-releng.sh +++ b/jenkins-config/global-vars-releng.sh @@ -11,7 +11,7 @@ ODLNEXUSPROXY=https://nexus.opendaylight.org REGISTRY_PORTS=10001 10002 10003 10004 RELEASE_USERNAME=odl-release RELEASE_EMAIL=collab-it+odl-release@linuxfoundation.org -SIGUL_BRIDGE_IP=10.30.168.3 +SIGUL_BRIDGE_IP=199.204.45.55 SIGUL_KEY=odl-release-2020 SILO=releng SONAR_URL=https://sonar.opendaylight.org diff --git a/jenkins-config/global-vars-sandbox.sh b/jenkins-config/global-vars-sandbox.sh index f32a5546c..022d4b662 100644 --- a/jenkins-config/global-vars-sandbox.sh +++ b/jenkins-config/global-vars-sandbox.sh @@ -9,7 +9,7 @@ JENKINS_HOSTNAME=vex-yul-odl-jenkins-2 NEXUS_URL=https://nexus.opendaylight.org ODLNEXUSPROXY=https://nexus.opendaylight.org REGISTRY_PORTS=10001 10002 10003 10004 -SIGUL_BRIDGE_IP=10.30.168.3 +SIGUL_BRIDGE_IP=199.204.45.55 SIGUL_KEY=odl-sandbox SILO=sandbox SONAR_URL=https://sonar.opendaylight.org diff --git a/jenkins-config/managed-config-files/custom/sigul-config/content b/jenkins-config/managed-config-files/custom/sigul-config/content index 145a391f5..84fee55b0 100644 --- a/jenkins-config/managed-config-files/custom/sigul-config/content +++ b/jenkins-config/managed-config-files/custom/sigul-config/content @@ -1,14 +1,15 @@ [client] -bridge-hostname: vex-yul-odl-ingress-1.ci.codeaurora.org +bridge-hostname: sigul-bridge-yul.linuxfoundation.org bridge-port: 44334 -client-cert-nickname: vex-yul-odl-jenkins-1.ci.codeaurora.org +client-cert-nickname: $SIGUL_CONFIG_USR server-hostname: vex-yul-wl-sigul-server-1.dr.codeaurora.org -user-name: vex-yul-odl-jenkins-1.ci.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.yaml b/jenkins-config/managed-config-files/custom/sigul-config/customizedCredentialMappings.yaml index 8c9d0008b..37aea3aa7 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-password" - tokenKey: "SIGUL_NSS_PASS" + - credentialsId: "sigul-config-credentials" + tokenKey: "SIGUL_CONFIG"