From 8cb70f2ef8982618ec248f0d14425b024398e273 Mon Sep 17 00:00:00 2001 From: Nathan Sosnovske Date: Fri, 6 Nov 2015 15:04:12 -0800 Subject: [PATCH 01/17] Update hard coded RPM_NAMES to dynamic strings --- RRO-src/files/linux/spec/R_UBUNTU.spec | 42 +++++++++++++------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/RRO-src/files/linux/spec/R_UBUNTU.spec b/RRO-src/files/linux/spec/R_UBUNTU.spec index 2597bd4f..eb232cc9 100644 --- a/RRO-src/files/linux/spec/R_UBUNTU.spec +++ b/RRO-src/files/linux/spec/R_UBUNTU.spec @@ -34,7 +34,7 @@ and called at run time. %build -./configure --prefix=%{_libdir}/RRO-%{DIR_VERSION}/R-%{version} --enable-R-shlib --with-tcltk --with-cairo --with-libpng --with-libtiff --with-x=yes --with-lapack --enable-BLAS-shlib LIBR="-lpthread" --enable-memory-profiling +./configure --prefix=%{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version} --enable-R-shlib --with-tcltk --with-cairo --with-libpng --with-libtiff --with-x=yes --with-lapack --enable-BLAS-shlib LIBR="-lpthread" --enable-memory-profiling make -j8 %install @@ -43,16 +43,16 @@ make -j8 # %find_lang %{name} rm -f %{buildroot}/%{_infodir}/dir -cp %{_topdir}/Rprofile.site %{buildroot}%{_libdir}/RRO-%{DIR_VERSION}/R-%{version}/lib/R/etc -cp %{_topdir}/README.txt %{buildroot}%{_libdir}/RRO-%{DIR_VERSION} -cp %{_topdir}/COPYING %{buildroot}%{_libdir}/RRO-%{DIR_VERSION} +cp %{_topdir}/Rprofile.site %{buildroot}%{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/lib/R/etc +cp %{_topdir}/README.txt %{buildroot}%{_libdir}/:::RPM_NAME:::-%{DIR_VERSION} +cp %{_topdir}/COPYING %{buildroot}%{_libdir}/:::RPM_NAME:::-%{DIR_VERSION} if [ -d "/tmp/rro_extra_pkgs" ] then for filename in :::EXTRA_PKGS:::; do - %{buildroot}%{_libdir}/RRO-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/R --vanilla --install-tests CMD INSTALL /tmp/rro_extra_pkgs/${filename} + %{buildroot}%{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/R --vanilla --install-tests CMD INSTALL /tmp/rro_extra_pkgs/${filename} done - pushd %{buildroot}%{_libdir}/RRO-%{DIR_VERSION}/R-%{version}/%libnn/R/library + pushd %{buildroot}%{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/%libnn/R/library if [ -d "foreach" ]; then rm -rf foreach fi @@ -69,10 +69,10 @@ if test "${RPM_INSTALL_PREFIX0}" = ""; then fi rm -f /usr/bin/R rm -f /usr/bin/Rscript -ln -s $RPM_INSTALL_PREFIX0/%{_lib}/RRO-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/R $RPM_INSTALL_PREFIX0/%{_lib}/RRO-%{DIR_VERSION}/R-%{version}/bin/R -ln -s $RPM_INSTALL_PREFIX0/%{_lib}/RRO-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/Rscript $RPM_INSTALL_PREFIX0/%{_lib}/RRO-%{DIR_VERSION}/R-%{version}/bin/Rscript -ln -s $RPM_INSTALL_PREFIX0/%{_lib}/RRO-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/R /usr/bin -ln -s $RPM_INSTALL_PREFIX0/%{_lib}/RRO-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/Rscript /usr/bin +ln -s $RPM_INSTALL_PREFIX0/%{_lib}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/R $RPM_INSTALL_PREFIX0/%{_lib}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/bin/R +ln -s $RPM_INSTALL_PREFIX0/%{_lib}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/Rscript $RPM_INSTALL_PREFIX0/%{_lib}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/bin/Rscript +ln -s $RPM_INSTALL_PREFIX0/%{_lib}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/R /usr/bin +ln -s $RPM_INSTALL_PREFIX0/%{_lib}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/Rscript /usr/bin %postun #if test "${revo_prefix}" = ""; then @@ -80,26 +80,26 @@ ln -s $RPM_INSTALL_PREFIX0/%{_lib}/RRO-%{DIR_VERSION}/R-%{version}/%libnn/R/bin/ #fi #revo_prefix=`echo "$revo_prefix" | sed "s/\/*$//"` revo_prefix=/usr -rm -f ${revo_prefix}/lib64/RRO-%{DIR_VERSION}/R-%{version}/bin/R -rm -f ${revo_prefix}/lib64/RRO-%{DIR_VERSION}/R-%{version}/bin/Rscript +rm -f ${revo_prefix}/lib64/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/bin/R +rm -f ${revo_prefix}/lib64/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/bin/Rscript rm -f /usr/bin/R rm -f /usr/bin/Rscript # %files -f %{name}.lang %files %defattr(-, root, root) -%{_libdir}/RRO-%{DIR_VERSION}/R-%{version}/ -%{_libdir}/RRO-%{DIR_VERSION}/COPYING -%{_libdir}/RRO-%{DIR_VERSION}/README.txt -# %{_libdir}/RRO-%{DIR_VERSION}/sources/ +%{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/ +%{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/COPYING +%{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/README.txt +# %{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/sources/ #%{_bindir}/Revo64 #%{_bindir}/Revoscript -# %exclude %{_libdir}/RRO-%{DIR_VERSION}/R-%{version}/%{libnn}/R/etc/repositories -# %exclude %{_libdir}/RRO-%{DIR_VERSION}/R-%{version}/%{libnn}/R/lib/libRblas.so -# %exclude %{_libdir}/RRO-%{DIR_VERSION}/R-%{version}/%{libnn}/R/lib/libRlapack.so -%exclude %{_libdir}/RRO-%{DIR_VERSION}/R-%{version}/bin/R -%exclude %{_libdir}/RRO-%{DIR_VERSION}/R-%{version}/bin/Rscript +# %exclude %{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/%{libnn}/R/etc/repositories +# %exclude %{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/%{libnn}/R/lib/libRblas.so +# %exclude %{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/%{libnn}/R/lib/libRlapack.so +%exclude %{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/bin/R +%exclude %{_libdir}/:::RPM_NAME:::-%{DIR_VERSION}/R-%{version}/bin/Rscript %changelog * Tue Sep 06 2011 The Coon of Ty 2.8-1 From 696ee10e2ac57dff78e8133e8444aa837543966a Mon Sep 17 00:00:00 2001 From: Nathan Sosnovske Date: Tue, 10 Nov 2015 08:40:19 -0800 Subject: [PATCH 02/17] Add requirements to R spec file --- RRO-src/files/linux/spec/R_CENTOS.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/RRO-src/files/linux/spec/R_CENTOS.spec b/RRO-src/files/linux/spec/R_CENTOS.spec index 817ad6bb..3760169d 100644 --- a/RRO-src/files/linux/spec/R_CENTOS.spec +++ b/RRO-src/files/linux/spec/R_CENTOS.spec @@ -13,6 +13,7 @@ BuildRequires: pango-devel, libXt-devel, libICE-devel, libX11-devel, libSM-devel BuildRequires: cairo-devel, ncurses-devel Requires: libpng, libjpeg, readline, libtiff, gcc, make, gcc-gfortran Requires: ghostscript-fonts, libgfortran, cairo-devel, curl, libicu +Requires: pango, libSM, libXt, libXmu AutoReqProv: No Requires(post): info From 6e5958529a5eecb2156c15c3dd02ad327090295b Mon Sep 17 00:00:00 2001 From: Nathan Sosnovske Date: Wed, 11 Nov 2015 08:15:22 -0800 Subject: [PATCH 03/17] Update iterators, foreach, and doParallel version numbers. --- RRO-src/buildFiles/packages-linux-connector.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RRO-src/buildFiles/packages-linux-connector.json b/RRO-src/buildFiles/packages-linux-connector.json index 3f1c1ed3..a02d16f6 100644 --- a/RRO-src/buildFiles/packages-linux-connector.json +++ b/RRO-src/buildFiles/packages-linux-connector.json @@ -1,8 +1,8 @@ { "packages": [ - { "name": "iterators", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/iterators_1.0.7.tar.gz", "destFileName": "iterators_1.0.7.tar.gz" }, - { "name": "foreach", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/foreach_1.4.2.tar.gz", "destFileName": "foreach_1.4.2.tar.gz" }, - { "name": "doParallel", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/doParallel_1.0.8.tar.gz", "destFileName": "doParallel_1.0.8.tar.gz" }, + { "name": "iterators", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/iterators_1.0.8.tar.gz", "destFileName": "iterators_1.0.8.tar.gz" }, + { "name": "foreach", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/foreach_1.4.3.tar.gz", "destFileName": "foreach_1.4.3.tar.gz" }, + { "name": "doParallel", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/doParallel_1.0.10.tar.gz", "destFileName": "doParallel_1.0.10.tar.gz" }, { "name": "RUnit", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/RUnit_0.4.26.tar.gz", "destFileName": "RUnit_0.4.26.tar.gz" }, { "name": "RevoMods", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/RevoMods_8.0.0.tar.gz", "destFileName": "RevoMods_8.0.0.tar.gz" }, { "name": "RevoUtils", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/RevoUtils_8.0.0.tar.gz", "destFileName": "RevoUtils_8.0.0.tar.gz" }, From 755157d3ed0c58e965425ba95fc9e8cf438733fb Mon Sep 17 00:00:00 2001 From: Nathan Sosnovske Date: Wed, 11 Nov 2015 08:17:18 -0800 Subject: [PATCH 04/17] Update windows package versions. --- RRO-src/buildFiles/packages-windows-connector.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/RRO-src/buildFiles/packages-windows-connector.json b/RRO-src/buildFiles/packages-windows-connector.json index f6725a39..3651df0c 100644 --- a/RRO-src/buildFiles/packages-windows-connector.json +++ b/RRO-src/buildFiles/packages-windows-connector.json @@ -1,8 +1,8 @@ { "packages": [ - { "name": "iterators", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/iterators_1.0.7.tar.gz", "destFileName": "iterators_1.0.7.tar.gz" }, - { "name": "foreach", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/foreach_1.4.2.tar.gz", "destFileName": "foreach_1.4.2.tar.gz" }, - { "name": "doParallel", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/doParallel_1.0.8.tar.gz", "destFileName": "doParallel_1.0.8.tar.gz" }, + { "name": "iterators", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/iterators_1.0.8.tar.gz", "destFileName": "iterators_1.0.8.tar.gz" }, + { "name": "foreach", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/foreach_1.4.3.tar.gz", "destFileName": "foreach_1.4.3.tar.gz" }, + { "name": "doParallel", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/doParallel_1.0.10.tar.gz", "destFileName": "doParallel_1.0.10.tar.gz" }, { "name": "RUnit", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/RUnit_0.4.26.tar.gz", "destFileName": "RUnit_0.4.26.tar.gz" }, { "name": "RevoMods", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/RevoMods_8.0.0.tar.gz", "destFileName": "RevoMods_8.0.0.tar.gz" }, { "name": "RevoUtils", "source": "url", "location": "http://packages.revolutionanalytics.com/RRO/RevoUtils_8.0.0.tar.gz", "destFileName": "RevoUtils_8.0.0.tar.gz" }, From 9b6827834c126912ebb491a7bc3d29aa0d93c9cc Mon Sep 17 00:00:00 2001 From: Nathan Sosnovske Date: Wed, 11 Nov 2015 15:21:27 -0800 Subject: [PATCH 05/17] Correct one missed RRO to MRO --- RRO-src/files/windows/connector/reg3264.iss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RRO-src/files/windows/connector/reg3264.iss b/RRO-src/files/windows/connector/reg3264.iss index 6d27a8e8..ba825cbc 100644 --- a/RRO-src/files/windows/connector/reg3264.iss +++ b/RRO-src/files/windows/connector/reg3264.iss @@ -1,5 +1,5 @@ [Icons] -Name: "{group}\RRO for RRE @RVER@ 64-bit"; Filename: "{app}\bin\x64\Rgui.exe"; IconFilename: "{app}\etc\REV_14419_Clark_2C.ico"; WorkingDir: "{userdocs}"; Check: isComponentSelected('x64') and Is64BitInstallMode +Name: "{group}\MRO for RRE @RVER@ 64-bit"; Filename: "{app}\bin\x64\Rgui.exe"; IconFilename: "{app}\etc\REV_14419_Clark_2C.ico"; WorkingDir: "{userdocs}"; Check: isComponentSelected('x64') and Is64BitInstallMode Name: "{commondesktop}\MRO-for-RRE Rgui @RVER@ 64-bit"; Filename: "{app}\bin\x64\Rgui.exe"; MinVersion: 0,5.0; IconFilename: "{app}\etc\REV_14419_Clark_2C.ico"; Tasks: desktopicon; WorkingDir: "{userdocs}"; Check: isComponentSelected('x64') and Is64BitInstallMode From 946d853182d555b4497b79ad30f34c10697913d7 Mon Sep 17 00:00:00 2001 From: Nathan Sosnovske Date: Mon, 23 Nov 2015 14:27:34 -0800 Subject: [PATCH 06/17] Remove cairo-devel requirement and change to cairo. Add zip requirement --- RRO-src/files/linux/spec/R_CENTOS.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RRO-src/files/linux/spec/R_CENTOS.spec b/RRO-src/files/linux/spec/R_CENTOS.spec index 3760169d..5a72e756 100644 --- a/RRO-src/files/linux/spec/R_CENTOS.spec +++ b/RRO-src/files/linux/spec/R_CENTOS.spec @@ -12,8 +12,8 @@ BuildRequires: libpng-devel, libjpeg-devel, readline-devel, libtiff-devel BuildRequires: pango-devel, libXt-devel, libICE-devel, libX11-devel, libSM-devel BuildRequires: cairo-devel, ncurses-devel Requires: libpng, libjpeg, readline, libtiff, gcc, make, gcc-gfortran -Requires: ghostscript-fonts, libgfortran, cairo-devel, curl, libicu -Requires: pango, libSM, libXt, libXmu +Requires: ghostscript-fonts, libgfortran, cairo, curl, libicu +Requires: pango, libSM, libXt, libXmu, zip AutoReqProv: No Requires(post): info From 6cce075e21de0e2116fd78cd9abc4a6a5d898882 Mon Sep 17 00:00:00 2001 From: Nathan Sosnovske Date: Mon, 23 Nov 2015 14:28:45 -0800 Subject: [PATCH 07/17] Add zip requirement to sles10 --- RRO-src/files/linux/spec/R_SLES10.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RRO-src/files/linux/spec/R_SLES10.spec b/RRO-src/files/linux/spec/R_SLES10.spec index 32ce55f0..19686698 100644 --- a/RRO-src/files/linux/spec/R_SLES10.spec +++ b/RRO-src/files/linux/spec/R_SLES10.spec @@ -17,7 +17,7 @@ BuildRequires: cairo-devel, ncurses-devel Requires: libpng, libjpeg, readline Requires: libtiff, ghostscript-fonts-std Requires: gcc, make, gcc-fortran, gcc-c++ -Requires: glibc, glibc-devel, curl +Requires: glibc, glibc-devel, curl, zip AutoReqProv: No %define libnn lib64 From 872fab134f2153d26540336965b7670c4075bb69 Mon Sep 17 00:00:00 2001 From: Nathan Sosnovske Date: Mon, 23 Nov 2015 14:29:06 -0800 Subject: [PATCH 08/17] Add zip to sles11 requirements --- RRO-src/files/linux/spec/R_SLES11.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/RRO-src/files/linux/spec/R_SLES11.spec b/RRO-src/files/linux/spec/R_SLES11.spec index a51e1c2b..550f4dc9 100644 --- a/RRO-src/files/linux/spec/R_SLES11.spec +++ b/RRO-src/files/linux/spec/R_SLES11.spec @@ -15,9 +15,9 @@ BuildRequires: libpng-devel, libjpeg-devel, readline-devel, libtiff-devel BuildRequires: xorg-x11-libSM-devel, xorg-x11-libX11-devel, xorg-x11-libICE-devel, BuildRequires: xorg-x11-libXt-devel, xorg-x11-libXmu-devel, pango-devel BuildRequires: cairo-devel, ncurses-devel -Requires: libpng, libjpeg, readline, cairo-devel, libgfortran43 +Requires: libpng, libjpeg, readline, cairo, libgfortran43 Requires: libtiff, ghostscript-fonts-std -Requires: gcc, make, gcc-fortran, gcc-c++, curl +Requires: gcc, make, gcc-fortran, gcc-c++, curl, zip AutoReqProv: Yes %define libnn lib64 From 3278db2e56e352e3ff5484b932a8d1b1662b139e Mon Sep 17 00:00:00 2001 From: Nathan Sosnovske Date: Wed, 16 Dec 2015 18:16:17 -0800 Subject: [PATCH 09/17] test jenkinsfile --- Jenkinsfile | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 00000000..06de56b6 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,22 @@ +parallel centos_build: { + node('centos') { + checkout([$class: 'GitSCM', + branches: [[name: '*/dev']], + doGenerateSubmoduleConfigurations: false, + extensions: [], + submoduleCfg: [], + userRemoteConfigs: [[url: 'git://github.com/RevolutionAnalytics/RRO.git']]]) + sh './build.sh' + } +}, +mac_build: { + node('mac_os_x') { + checkout([$class: 'GitSCM', + branches: [[name: '*/dev']], + doGenerateSubmoduleConfigurations: false, + extensions: [], + submoduleCfg: [], + userRemoteConfigs: [[url: 'git://github.com/RevolutionAnalytics/RRO.git']]]) + sh 'pushd RRO-src/OSX && ./build-OSX.sh' + } +} From bcfeff68c9be9f6650cd27315afa23b1db877260 Mon Sep 17 00:00:00 2001 From: Keith Schaab Date: Thu, 17 Dec 2015 11:00:56 -0800 Subject: [PATCH 10/17] Adding windows build to Jenkinsfile --- Jenkinsfile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 06de56b6..c85216c5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,4 +19,15 @@ mac_build: { userRemoteConfigs: [[url: 'git://github.com/RevolutionAnalytics/RRO.git']]]) sh 'pushd RRO-src/OSX && ./build-OSX.sh' } +}, +windows_build: { + node('windows') { + checkout([$class: 'GitSCM', + branches: [[name: '*/dev']], + doGenerateSubmoduleConfigurations: false, + extensions: [], + submoduleCfg: [], + userRemoteConfigs: [[url: 'git://github.com/RevolutionAnalytics/RRO.git']]]) + bat 'build.bat' + } } From dc15ea730888e2a24687dc4e720e97eba916bc6a Mon Sep 17 00:00:00 2001 From: Nathan Sosnovske Date: Thu, 17 Dec 2015 14:16:08 -0800 Subject: [PATCH 11/17] Update Jenkinsfile --- Jenkinsfile | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c85216c5..51a57f7c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,16 @@ parallel centos_build: { - node('centos') { + node('centos6') { + checkout([$class: 'GitSCM', + branches: [[name: '*/dev']], + doGenerateSubmoduleConfigurations: false, + extensions: [], + submoduleCfg: [], + userRemoteConfigs: [[url: 'git://github.com/RevolutionAnalytics/RRO.git']]]) + sh './build.sh' + } +}, +parallel centos_build: { + node('suse11') { checkout([$class: 'GitSCM', branches: [[name: '*/dev']], doGenerateSubmoduleConfigurations: false, @@ -19,15 +30,4 @@ mac_build: { userRemoteConfigs: [[url: 'git://github.com/RevolutionAnalytics/RRO.git']]]) sh 'pushd RRO-src/OSX && ./build-OSX.sh' } -}, -windows_build: { - node('windows') { - checkout([$class: 'GitSCM', - branches: [[name: '*/dev']], - doGenerateSubmoduleConfigurations: false, - extensions: [], - submoduleCfg: [], - userRemoteConfigs: [[url: 'git://github.com/RevolutionAnalytics/RRO.git']]]) - bat 'build.bat' - } } From 88f331f48a41b9e3250356c9a55c1a025d3bae2a Mon Sep 17 00:00:00 2001 From: Nathan Sosnovske Date: Thu, 17 Dec 2015 14:16:39 -0800 Subject: [PATCH 12/17] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 51a57f7c..77f7ca1f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ parallel centos_build: { sh './build.sh' } }, -parallel centos_build: { +parallel sles11_build: { node('suse11') { checkout([$class: 'GitSCM', branches: [[name: '*/dev']], From df01b82bebef818a416695fbeff46bb69fbd86cd Mon Sep 17 00:00:00 2001 From: Nathan Sosnovske Date: Thu, 17 Dec 2015 14:19:01 -0800 Subject: [PATCH 13/17] Update Jenkinsfile --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 77f7ca1f..5cafe11b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,7 @@ parallel centos_build: { sh './build.sh' } }, -parallel sles11_build: { +sles11_build: { node('suse11') { checkout([$class: 'GitSCM', branches: [[name: '*/dev']], From 4eeec60900117028f673497492e9d0e4734ec4c1 Mon Sep 17 00:00:00 2001 From: Nathan Sosnovske Date: Fri, 18 Dec 2015 14:40:02 -0800 Subject: [PATCH 14/17] Update Jenkinsfile --- Jenkinsfile | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 5cafe11b..d8d4ef49 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,6 +9,17 @@ parallel centos_build: { sh './build.sh' } }, +centos5_build: { + node('centos5') { + checkout([$class: 'GitSCM', + branches: [[name: '*/dev']], + doGenerateSubmoduleConfigurations: false, + extensions: [], + submoduleCfg: [], + userRemoteConfigs: [[url: 'git://github.com/RevolutionAnalytics/RRO.git']]]) + sh './build.sh' + } +}, sles11_build: { node('suse11') { checkout([$class: 'GitSCM', From 8baee623a041169a0d71007e3196ae4b9a2c310f Mon Sep 17 00:00:00 2001 From: Nathan Sosnovske Date: Fri, 18 Dec 2015 14:50:37 -0800 Subject: [PATCH 15/17] Update Jenkinsfile --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index d8d4ef49..bd4b663b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,6 +7,7 @@ parallel centos_build: { submoduleCfg: [], userRemoteConfigs: [[url: 'git://github.com/RevolutionAnalytics/RRO.git']]]) sh './build.sh' + step([$class: 'ArtifactArchiver', artifacts: '**/*.rpm', fingerprint: true]) } }, centos5_build: { From 90591a8f0da21eaa8ffffdab4f00addc6e1f8ab5 Mon Sep 17 00:00:00 2001 From: Nathan Sosnovske Date: Fri, 18 Dec 2015 15:14:17 -0800 Subject: [PATCH 16/17] Update Jenkinsfile --- Jenkinsfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index bd4b663b..e1f41ca5 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -19,6 +19,7 @@ centos5_build: { submoduleCfg: [], userRemoteConfigs: [[url: 'git://github.com/RevolutionAnalytics/RRO.git']]]) sh './build.sh' + step([$class: 'ArtifactArchiver', artifacts: '**/*.rpm', fingerprint: true]) } }, sles11_build: { @@ -30,6 +31,7 @@ sles11_build: { submoduleCfg: [], userRemoteConfigs: [[url: 'git://github.com/RevolutionAnalytics/RRO.git']]]) sh './build.sh' + step([$class: 'ArtifactArchiver', artifacts: '**/*.rpm', fingerprint: true]) } }, mac_build: { @@ -41,5 +43,6 @@ mac_build: { submoduleCfg: [], userRemoteConfigs: [[url: 'git://github.com/RevolutionAnalytics/RRO.git']]]) sh 'pushd RRO-src/OSX && ./build-OSX.sh' + step([$class: 'ArtifactArchiver', artifacts: '**/*.pkg', fingerprint: true]) } } From 584e8d34c39483efc937650c4a7487daeacb0a59 Mon Sep 17 00:00:00 2001 From: Nathan Sosnovske Date: Mon, 21 Dec 2015 15:37:16 -0800 Subject: [PATCH 17/17] Update Jenkinsfile --- Jenkinsfile | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e1f41ca5..936dd178 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,47 +1,27 @@ parallel centos_build: { node('centos6') { - checkout([$class: 'GitSCM', - branches: [[name: '*/dev']], - doGenerateSubmoduleConfigurations: false, - extensions: [], - submoduleCfg: [], - userRemoteConfigs: [[url: 'git://github.com/RevolutionAnalytics/RRO.git']]]) + checkout scm sh './build.sh' step([$class: 'ArtifactArchiver', artifacts: '**/*.rpm', fingerprint: true]) } }, centos5_build: { node('centos5') { - checkout([$class: 'GitSCM', - branches: [[name: '*/dev']], - doGenerateSubmoduleConfigurations: false, - extensions: [], - submoduleCfg: [], - userRemoteConfigs: [[url: 'git://github.com/RevolutionAnalytics/RRO.git']]]) + checkout scm sh './build.sh' step([$class: 'ArtifactArchiver', artifacts: '**/*.rpm', fingerprint: true]) } }, sles11_build: { node('suse11') { - checkout([$class: 'GitSCM', - branches: [[name: '*/dev']], - doGenerateSubmoduleConfigurations: false, - extensions: [], - submoduleCfg: [], - userRemoteConfigs: [[url: 'git://github.com/RevolutionAnalytics/RRO.git']]]) + checkout scm sh './build.sh' step([$class: 'ArtifactArchiver', artifacts: '**/*.rpm', fingerprint: true]) } }, mac_build: { node('mac_os_x') { - checkout([$class: 'GitSCM', - branches: [[name: '*/dev']], - doGenerateSubmoduleConfigurations: false, - extensions: [], - submoduleCfg: [], - userRemoteConfigs: [[url: 'git://github.com/RevolutionAnalytics/RRO.git']]]) + checkout scm sh 'pushd RRO-src/OSX && ./build-OSX.sh' step([$class: 'ArtifactArchiver', artifacts: '**/*.pkg', fingerprint: true]) }