Rename files to be more generic, add local naming to variables used in scripts

Author: korlaxxalrok

Jenkinsfile

@@ -33,7 +33,7 @@ pipeline {
                 branch "deploy-*"
             }
             steps {
-                sh "jenkins/${env.INDICATOR}-jenkins-package.sh"
+                sh "jenkins/jenkins-package.sh"
             }
         }
 
@@ -42,7 +42,7 @@ pipeline {
                 branch "deploy-*"
             }
             steps {
-                sh "jenkins/${env.INDICATOR}-jenkins-deploy.sh"
+                sh "jenkins/jenkins-deploy.sh"
             }
         }
     }

jenkins/jhu-jenkins-deploy.sh renamed to jenkins/jenkins-deploy.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# JHU indicator: Jenkins deploy
+# Jenkins deploy
 #
 
 set -exo pipefail
@@ -10,8 +10,6 @@ source ~/.bash_profile
 # Deploy
 #
 
-#indicator="jhu"
-
 cd "${WORKSPACE}/ansible" || exit
 
 # Ansible!

jenkins/jhu-jenkins-package.sh renamed to jenkins/jenkins-package.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# JHU indicator: Jenkins package
+# Jenkins package
 #
 
 set -exo pipefail
@@ -10,8 +10,6 @@ source ~/.bash_profile
 # Package
 #
 
-#indicator="jhu"
-
 cd "${WORKSPACE}" || exit
 
 # Create .tar.gz for deployment

jenkins/jhu-jenkins-build.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# JHU indicator: Jenkins build
+# JHU: Jenkins build
 #
 
 set -exo pipefail
@@ -10,9 +10,9 @@ source ~/.bash_profile
 # Build
 #
 
-indicator="jhu"
+local_indicator="jhu"
 
-cd "${WORKSPACE}/${indicator}" || exit
+cd "${WORKSPACE}/${local_indicator}" || exit
 
 # Set up venv
 python -m venv env

jenkins/jhu-jenkins-test.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 #
-# JHU indicator: Jenkins test
+# JHU: Jenkins test
 #
 
 set -exo pipefail
@@ -10,9 +10,9 @@ source ~/.bash_profile
 # Test
 #
 
-indicator="jhu"
+local_indicator="jhu"
 
-cd "${WORKSPACE}/${indicator}" || exit
+cd "${WORKSPACE}/${local_indicator}" || exit
 
 # Linter
 env/bin/pylint delphi_jhu