[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible archlinux: s#arch#archlinux# in script and job names

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 49cc1830343050e9da932fdb90d99b751678d456
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Dec 10 12:08:11 2015 +0100

    reproducible archlinux: s#arch#archlinux# in script and job names
---
 bin/jenkins_node_wrapper.sh                              |  8 ++++----
 ...d_arch_pkg.sh => reproducible_build_archlinux_pkg.sh} |  2 +-
 ..._setup.sh => reproducible_setup_archlinux_schroot.sh} |  0
 job-cfg/reproducible.yaml                                | 16 ++++++++--------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh
index 4d41a25..5c2d24b 100755
--- a/bin/jenkins_node_wrapper.sh
+++ b/bin/jenkins_node_wrapper.sh
@@ -103,12 +103,12 @@ elif [[ "$*" =~ reproducible_netbsd ]] ; then
 	exec /srv/jenkins/bin/reproducible_netbsd.sh ; croak "Exec failed";
 elif [[ "$*" =~ reproducible_freebsd ]] ; then
 	exec /srv/jenkins/bin/reproducible_freebsd.sh ; croak "Exec failed";
-elif [[ "$*" =~ reproducible_setup_schroot_arch ]] ; then
-	exec /srv/jenkins/bin/reproducible_arch_schroot_setup.sh ; croak "Exec failed";
+elif [[ "$*" =~ reproducible_setup_schroot_archlinux ]] ; then
+	exec /srv/jenkins/bin/reproducible_setup_archlinux_schroot.sh ; croak "Exec failed";
 elif [[ "$*" =~ reproducible_setup_mock_fedora23_x86_64 ]] ; then
 	exec /srv/jenkins/bin/reproducible_setup_mock.sh fedora-23 x86_64 ; croak "Exec failed";
-elif [ "$1" = "/srv/jenkins/bin/reproducible_build_arch_pkg.sh" ] && ( [ "$2" = "1" ] || [ "$2" = "2" ] ) ; then
-	exec /srv/jenkins/bin/reproducible_build_arch_pkg.sh "$2" "$3" "$4" ; croak "Exec failed";
+elif [ "$1" = "/srv/jenkins/bin/reproducible_build_archlinux_pkg.sh" ] && ( [ "$2" = "1" ] || [ "$2" = "2" ] ) ; then
+	exec /srv/jenkins/bin/reproducible_build_archlinux_pkg.sh "$2" "$3" "$4" ; croak "Exec failed";
 elif [ "$*" = "some_jenkins_job_name" ] ; then
 	exec echo run any commands here ; croak "Exec failed";
 fi
diff --git a/bin/reproducible_build_arch_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh
similarity index 98%
rename from bin/reproducible_build_arch_pkg.sh
rename to bin/reproducible_build_archlinux_pkg.sh
index bb1658d..5cd509d 100755
--- a/bin/reproducible_build_arch_pkg.sh
+++ b/bin/reproducible_build_archlinux_pkg.sh
@@ -112,7 +112,7 @@ remote_build() {
 		sleep ${SLEEPTIME}m
 		exec /srv/jenkins/bin/abort.sh
 	fi
-	ssh -p $PORT $NODE /srv/jenkins/bin/reproducible_build_arch_pkg.sh $BUILDNR ${SRCPACKAGE} ${TMPDIR}
+	ssh -p $PORT $NODE /srv/jenkins/bin/reproducible_build_archlinux_pkg.sh $BUILDNR ${SRCPACKAGE} ${TMPDIR}
 	RESULT=$?
 	if [ $RESULT -ne 0 ] ; then
 		ssh -p $PORT $NODE "rm -r $TMPDIR" || true
diff --git a/bin/reproducible_arch_schroot_setup.sh b/bin/reproducible_setup_archlinux_schroot.sh
similarity index 100%
rename from bin/reproducible_arch_schroot_setup.sh
rename to bin/reproducible_setup_archlinux_schroot.sh
diff --git a/job-cfg/reproducible.yaml b/job-cfg/reproducible.yaml
index 7d282fd..8888cf1 100644
--- a/job-cfg/reproducible.yaml
+++ b/job-cfg/reproducible.yaml
@@ -755,7 +755,7 @@
 
 - job-template:
     defaults: reproducible_other_projects
-    name: '{name}_setup_schroot_arch'
+    name: '{name}_setup_schroot_archlinux'
 
 - job-template:
     defaults: reproducible_other_projects
@@ -763,11 +763,11 @@
 
 - job-template:
     defaults: reproducible_builder_trigger
-    name: '{name}_builder_arch_1'
+    name: '{name}_builder_archlinux_1'
 
 - job-template:
     defaults: reproducible_builder_trigger
-    name: '{name}_builder_arch_2'
+    name: '{name}_builder_archlinux_2'
 
 - job-template:
     defaults: reproducible
@@ -1519,7 +1519,7 @@
             my_shell: '/srv/jenkins/bin/reproducible_freebsd.sh'
             my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
             my_node: ''
-        - '{name}_setup_schroot_arch':
+        - '{name}_setup_schroot_archlinux':
             my_description: 'Setup an Arch Linux schroot to test Arch Linux packages for reproducibility.'
             my_timed: '42 23 1 1 *'
             my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
@@ -1531,18 +1531,18 @@
             my_shell: '/srv/jenkins/bin/jenkins_master_wrapper.sh'
             my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
             my_node: 'profitbricks3'
-        - '{name}_builder_arch_1':
+        - '{name}_builder_archlinux_1':
             my_description: 'Try to reproducibly build an Arch Linux package.'
             my_timed: '* * * * *'
             my_trigger: 'reproducible_html_archlinux'
-            my_shell: '/srv/jenkins/bin/reproducible_build_arch_pkg.sh'
+            my_shell: '/srv/jenkins/bin/reproducible_build_archlinux_pkg.sh'
             my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
             my_node: ''
-        - '{name}_builder_arch_2':
+        - '{name}_builder_archlinux_2':
             my_description: 'Try to reproducibly build an Arch Linux package.'
             my_timed: '* * * * *'
             my_trigger: 'reproducible_html_archlinux'
-            my_shell: '/srv/jenkins/bin/reproducible_build_arch_pkg.sh'
+            my_shell: '/srv/jenkins/bin/reproducible_build_archlinux_pkg.sh'
             my_recipients: 'qa-jenkins-scm at lists.alioth.debian.org'
             my_node: ''
         - '{name}_html_archlinux':

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git