From d143308ff68fa69c9a0d5dbce1b9d179189f2e24 Mon Sep 17 00:00:00 2001 From: hyokeun Date: Thu, 10 May 2018 17:40:31 +0900 Subject: [PATCH] Fix install directory for scriptApproval.xml file Change-Id: Ia9b63910bbf335270c72acb1ea045a0a2ddd6425 --- packaging/jenkins-scripts.spec | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/packaging/jenkins-scripts.spec b/packaging/jenkins-scripts.spec index 3e3ba17..4e2f2ae 100644 --- a/packaging/jenkins-scripts.spec +++ b/packaging/jenkins-scripts.spec @@ -23,8 +23,9 @@ Requires: %{name}-abs = %{version}-%{release} Requires: %{name}-groovyinit = %{version}-%{release} BuildArch: noarch -%define destdir /var/lib/jenkins/%{name} -%define destinitdir /var/lib/jenkins/init.groovy.d +%define homedir /var/lib/jenkins +%define destdir %{homedir}/%{name} +%define destinitdir %{homedir}/init.groovy.d %description Jenkins build job will call this scripts when build job is triggered by @@ -112,7 +113,9 @@ Isolated job_submitobs to avoid package installation conflicts install -d %{buildroot}%{destdir} cp -r job_*.py job_*.groovy codebase.py dir-purge-tool.sh logs-collector.sh common obs_requests templates scripts vis dep_graph trbs abs %{buildroot}%{destdir}/ install -d %{buildroot}%{destinitdir} -cp -r groovy_init_scripts/* %{buildroot}%{destinitdir}/ +cp -r groovy_init_scripts/{Module*,init.groovy,setup.properties.example} %{buildroot}%{destinitdir}/ +install -d %{buildroot}%{homedir} +cp -r groovy_init_scripts/scriptApproval.xml %{buildroot}/%{homedir}/ %post common if [ ! -d /var/lib/jenkins/userContent ]; then @@ -329,7 +332,7 @@ fi %files groovyinit %defattr(-,jenkins,jenkins) -%dir /var/lib/jenkins/ +%dir %{homedir}/ %dir %{destinitdir}/ %{destinitdir}/init.groovy %{destinitdir}/setup.properties.example @@ -345,7 +348,7 @@ fi %{destinitdir}/Module_Node %{destinitdir}/Module_RabbitmqConsumer %{destinitdir}/Module_SshCredentials -%{destinitdir}/scriptApproval.xml +%{homedir}/scriptApproval.xml %files submitobs %defattr(-,jenkins,jenkins) -- 2.7.4