Merge "Fix: Set correct credentials for jenkins logs"

diff --git a/jenkins-config/managed-config-files/openstackUserData/jenkins-init-script/content b/jenkins-config/managed-config-files/openstackUserData/jenkins-init-script/content
index 10ec585..ddbf96a 100644 (file)
--- a/jenkins-config/managed-config-files/openstackUserData/jenkins-init-script/content
+++ b/jenkins-config/managed-config-files/openstackUserData/jenkins-init-script/content
@@ -1,15 +1,13 @@
 #!/bin/bash
-gerrit=gerrit.onap.org
-until host ${gerrit} &>/dev/null
+until host github.com &>/dev/null
 do
-    echo "Waiting until ${gerrit} is resolvable..."
+    echo "Waiting until github.com is resolvable..."
 done
-
-git clone --recurse-submodules https://${gerrit}/r/ci-management /opt/ciman
-/opt/ciman/jjb/global-jjb/jenkins-init-scripts/init.sh
+git clone https://github.com/lfit/releng-global-jjb.git /opt/ciman/global-jjb
+/opt/ciman/global-jjb/jenkins-init-scripts/init.sh
 
 IPADDR=$(facter ipaddress)
 HOSTNAME=$(facter hostname)
 FQDN=$(facter fqdn)
 
-echo "${IPADDR} ${HOSTNAME} ${FQDN}" >> /etc/hosts
+echo "^${IPADDR} ^${HOSTNAME} ^${FQDN}" >> /etc/hosts

diff --git a/jjb/cps/cps-cps-temporal.yaml b/jjb/cps/cps-cps-temporal.yaml
index 62d9288..d7b4ebc 100644 (file)
--- a/jjb/cps/cps-cps-temporal.yaml
+++ b/jjb/cps/cps-cps-temporal.yaml
@@ -41,6 +41,7 @@
           branch: master
       - 'istanbul':
           branch: 'istanbul'
+          cron: ''
     mvn-settings: cps-cps-temporal-settings
     files: '**'
     archive-artifacts: ''

diff --git a/jjb/cps/cps-ncmp-dmi-plugin.yaml b/jjb/cps/cps-ncmp-dmi-plugin.yaml
index a060364..c7f6a5d 100644 (file)
--- a/jjb/cps/cps-ncmp-dmi-plugin.yaml
+++ b/jjb/cps/cps-ncmp-dmi-plugin.yaml
@@ -43,6 +43,7 @@
           branch: master
       - 'istanbul':
           branch: 'istanbul'
+          cron: ''
     mvn-settings: cps-ncmp-dmi-plugin-settings
     files: '**'
     archive-artifacts: ''
@@ -96,4 +97,3 @@
     project: cps/ncmp-dmi-plugin
     branch: master
     build-node: centos7-docker-8c-8g
-

diff --git a/jjb/cps/cps.yaml b/jjb/cps/cps.yaml
index 00a2486..a82df80 100644 (file)
--- a/jjb/cps/cps.yaml
+++ b/jjb/cps/cps.yaml
@@ -56,8 +56,7 @@
           branch: 'master'
       - 'istanbul':
           branch: 'istanbul'
-      - 'honolulu':
-          branch: 'honolulu'
+          cron: ''
     mvn-settings: 'cps-settings'
     files: '**'
     archive-artifacts: ''