diff options
| author | Alexander Couzens <lynxis@fe80.eu> | 2016-10-12 22:42:33 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-10-12 22:43:39 +0200 |
| commit | 85b89d722bedce817dbe5bacff573f631c9363b7 (patch) | |
| tree | 765e5213fd9035024c5963044ee9547a50dcef42 | |
| parent | 51958ce1198c46df5fa98d3e50ff1b247998d7f2 (diff) | |
| download | jenkins.debian.net-85b89d722bedce817dbe5bacff573f631c9363b7.tar.xz | |
reproducible_openwrt|lede: move position of rsync command downwards
it matches also for --sender which shoudn't match
Signed-off-by: Holger Levsen <holger@layer-acht.org>
| -rwxr-xr-x | bin/jenkins_node_wrapper.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/bin/jenkins_node_wrapper.sh b/bin/jenkins_node_wrapper.sh index 67c7e0b4..57ec47a6 100755 --- a/bin/jenkins_node_wrapper.sh +++ b/bin/jenkins_node_wrapper.sh @@ -82,9 +82,6 @@ elif [ "$*" = "reproducible_nodes_info" ] ; then exec /srv/jenkins/bin/reproducible_info.sh ; croak "Exec failed"; elif [ "$1" = "/srv/jenkins/bin/reproducible_build.sh" ] && ( [ "$2" = "1" ] || [ "$2" = "2" ] ) ; then exec /srv/jenkins/bin/reproducible_build.sh "$2" "$3" "$4" "$5" ; croak "Exec failed"; -elif [[ "$*" =~ ^rsync\ --server\ .*\ \.\ /srv/reproducible-results/.* ]] ; then - # allow to push files to /srv/reproducible-results/ - exec rsync --server "$3" . "$5" ; croak "Exec failed"; elif [[ "$*" =~ ^rsync\ --server\ --sender\ .*\ \.\ /srv/reproducible-results/.* ]] ; then exec rsync --server --sender "$4" . "$6" ; croak "Exec failed"; elif [[ "$*" =~ ^rsync\ --server\ --sender\ .*\ \.\ /var/lib/jenkins/userContent/reproducible/.* ]] ; then @@ -93,6 +90,9 @@ elif [[ "$*" =~ ^rsync\ --server\ --sender\ .*\ \.\ /var/lib/jenkins/jobs/.*/wor exec rsync --server --sender "$4" . "$6" ; croak "Exec failed"; elif [[ "$*" =~ ^rsync\ --server\ .*\ \.\ /srv/d-i/isos/ ]] ; then exec rsync --server "$3" . "$5" ; croak "Exec failed"; +elif [[ "$*" =~ ^rsync\ --server\ .*\ \.\ /srv/reproducible-results/.* ]] ; then + # allow to push files to /srv/reproducible-results/ + exec rsync --server "$3" . "$5" ; croak "Exec failed"; elif [[ "$*" =~ ^mkdir\ -p\ /srv/d-i/isos.* ]] ; then exec mkdir -p "$3" ; croak "Exec failed"; elif [[ "$*" =~ ^rm\ -r\ /srv/reproducible-results/tmp.* ]] ; then |