As we will share the scripts with everyone in Linaro, let change the name

to a more generic one.

Signed-off-by: Daniel Lezcano <daniel.lezcano@free.fr>

6 files changed, 14 insertions, 14 deletions

diff --git a/pmwg-ci-blame b/ci-blame
index a80b74a..ddd3723 100755
--- a/pmwg-ci-blame
+++ b/ci-blame
@@ -1,6 +1,6 @@
 #!/bin/bash
 BASELINE_BRANCH="baseline"
-POWERCI_CONFIG=$(pmwg-ci-config)
+CI_CONFIG=$(ci-config)
 FILE=$1
 LINE=$2
 ERROR=$3
@@ -42,7 +42,7 @@ while read LINE; do
 	break
     fi
 
-done < $POWERCI_CONFIG
+done < $CI_CONFIG
 
 if [ $FOUND -eq 1 ]; then
 
diff --git a/pmwg-ci-config b/ci-config
index 2f7bade..58603e0 100755
--- a/pmwg-ci-config
+++ b/ci-config
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # config files are ordered by priority, first found is selected
-CONFIG_PATH=$PWD/.pmwg-ci/config:$HOME/.pmwg-ci/config:/etc/pmwg-ci.conf
+CONFIG_PATH=$PWD/.ci/config:$HOME/.ci/config:/etc/ci.conf
 
 for i in $(echo -e ${CONFIG_PATH//:/\\n}); do
 	if [ -f $i ]; then
diff --git a/pmwg-ci-integ b/ci-merge
index 6cc3489..3a24a7f 100755
--- a/pmwg-ci-integ
+++ b/ci-merge
@@ -20,11 +20,11 @@
 #  - Create a Linux clean tree
 #
 #  - Create one configuration file located at (topmost priority):
-#    - <linux>/.pmwg-ci/config
-#    - $HOME/.pmwg-ci/config
-#    - /etc/pmwg-ci.conf
+#    - <linux>/.ci/config
+#    - $HOME/.ci/config
+#    - /etc/ci.conf
 #
-#  The pmwg-ci-config script will return the first configuration file
+#  The ci-config script will return the first configuration file
 #  found in the list above.
 #
 #  - Call the script from the topmost directory of the source tree
@@ -114,7 +114,7 @@ CHANGED=0
 Help() {
     echo
 
-    echo " The Power Management Continuous Integration script takes all
+    echo " The Automerge Continuous Integration script takes all
  remote repositories, merge the <baseline> <branch> into the <integ>
  branch in the <local> working repository as well as the topics
  branches defined in the configuration file and upload the merge result
@@ -223,7 +223,7 @@ git_rerere_setup() {
 config_setup() {
 
     # The configuration file containing the name + url + branch
-    CONFIG=$(pmwg-ci-config)
+    CONFIG=$(ci-config)
 
     if [ "$CONFIG" == "" ]; then
 	echo "No configuration file found, aborting."
diff --git a/pmwg-ci-report b/ci-report
index 74ed8fd..3e89c2e 100755
--- a/pmwg-ci-report
+++ b/ci-report
@@ -16,9 +16,9 @@ GIT_DESCR=$(git describe --abbrev=$ABBREV)
 # Build the url
 KERNELCI_URL=https://storage.kernelci.org/pmwg/integ/$GIT_DESCR/build-logs-summary.txt
 
-BLAME_SCRIPT=pmwg-ci-blame
+BLAME_SCRIPT=ci-blame
 
-pmwg-ci_report() {
+ci_report() {
 
     URL=$KERNELCI_URL
 
@@ -56,4 +56,4 @@ pmwg-ci_report() {
     return $RET
 }
 
-pmwg-ci_report
+ci_report
diff --git a/pmwg-ci-test b/ci-test
index 5680b85..9d7f473 100755
--- a/pmwg-ci-test
+++ b/ci-test
@@ -16,7 +16,7 @@ ABBREV=12
 # Get the git description conforming to kernelci
 GIT_DESCR=$(git describe --abbrev=$ABBREV)
 
-pmwg-ci_test() {
+ci_test() {
 	# Test already done
 	git tag | grep -q test-$GIT_DESCR && return 1
 
@@ -37,4 +37,4 @@ pmwg-ci_test() {
 
 }
 
-pmwg-ci_test
+ci_test
diff --git a/pmwg-ci.conf b/ci.conf
index 66b4f8e..66b4f8e 100644
--- a/pmwg-ci.conf
+++ b/ci.conf