Remove refs to releng-defaults.yaml

The change is an extension to the original change from
Ifbc74bebbf75f1ac52295689ef4ef4cfd2062db3 to
rename releng-defaults.yaml to defaults.yaml

Change-Id: Ieb1d0dd3ee736a14533026306b6fd9ea074e451d
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>

diff --git a/check_prefix.sh b/check_prefix.sh
index 397bf4d49b658c833be2391e9825d2284e737309..5b62ac4e3d43f05b914b277d8a0489fc193b9866 100755 (executable)
--- a/check_prefix.sh
+++ b/check_prefix.sh
@@ -13,7 +13,7 @@
 # The production prefix MUST always be a blank string.
 
 if grep 'prefix:' jjb/defaults.yaml | grep -v "''"; then
-    echo "ERROR: A non-blank prefix is defined in jjb/releng-defaults.yaml"
+    echo "ERROR: A non-blank prefix is defined in jjb/defaults.yaml"
     echo "The prefix MUST be set to blank '' in production!"
     exit 1
 fi

diff --git a/jjb/integration/integration-macros.yaml b/jjb/integration/integration-macros.yaml
index 366e4f2ec77b0347398df3477240d2b04e3325fb..51eeb993a432b3d2b403dba25ac708791988cc81 100644 (file)
--- a/jjb/integration/integration-macros.yaml
+++ b/jjb/integration/integration-macros.yaml
@@ -12,7 +12,7 @@
 - parameter:
     name: distribution-karaf-version
     # Arguments:
-    #   karaf-version: Provide, otherwise releng-defaults value is used.
+    #   karaf-version: Provide, otherwise defaults.yaml value is used.
     parameters:
       - string:
           name: KARAF_VERSION

diff --git a/jjb/integration/integration-test-jobs.yaml b/jjb/integration/integration-test-jobs.yaml
index 26f9cf6cc087c93aa0bb94ba1d7ef83f7cce5e2d..13ec916cf875c68099048bf345215d3ccf9eeb2a 100644 (file)
--- a/jjb/integration/integration-test-jobs.yaml
+++ b/jjb/integration/integration-test-jobs.yaml
@@ -15,7 +15,7 @@
           branch: master
           stream: master
 
-    # CSIT Lists in releng-defaults.yaml
+    # CSIT Lists in defaults.yaml
     stream:
       - fluorine:
           branch: 'master'
@@ -43,7 +43,7 @@
       - 'integration-distribution-high-frequency-test-trigger-{stream}'
       - 'integration-update-csit-tests-{stream}'
 
-    # CSIT Lists in releng-defaults.yaml
+    # CSIT Lists in defaults.yaml
     stream:
       - fluorine:
           branch: 'master'

diff --git a/scripts/branch_cut/branch_cutter.sh b/scripts/branch_cut/branch_cutter.sh
index 9ee5dafd623d32e8fb3093c1ae816c2ecfb70cbe..4fade0a72d1c0373d0b2d1955e66534fcd785589 100755 (executable)
--- a/scripts/branch_cut/branch_cutter.sh
+++ b/scripts/branch_cut/branch_cutter.sh
@@ -11,7 +11,7 @@
 ##############################################################################
 
 # List of directories, files to exclude
-declare -a excludes=("releng-defaults.yaml"
+declare -a excludes=("defaults.yaml"
                      "releng-macros.yaml"
                      "global-jjb"
                      "lf-infra"