From d90567d2de17cdb9554d6e45191ffefcc243f807 Mon Sep 17 00:00:00 2001 From: Valentin Kuznetsov Date: Tue, 22 May 2018 04:46:51 -0400 Subject: [PATCH 01/38] New das2go version (#4014) --- das.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/das.spec b/das.spec index cc0f6ccf3b5..b0c21dc5d95 100644 --- a/das.spec +++ b/das.spec @@ -4,7 +4,7 @@ %define pkg0 DAS %define ver0 %realversion %define pkg1 das2go -%define ver1 04.00.05 +%define ver1 04.00.07 Source0: https://github.com/dmwm/%pkg0/archive/%ver0.tar.gz Source1: https://github.com/dmwm/%pkg1/archive/%ver1.tar.gz From aa145c357761c6463a47615ee7a5bd7bdb56e9fe Mon Sep 17 00:00:00 2001 From: ticoann Date: Tue, 22 May 2018 03:47:32 -0500 Subject: [PATCH 02/38] HG1804 testbed WMCore 1.1.14.pre1 (#4017) --- acdcserver.spec | 2 +- couchskel.spec | 2 +- py2-memory_profiler.spec | 16 ++++++++++++++++ py2-psutil.spec | 2 +- reqmgr2.spec | 4 ++-- reqmgr2ms.spec | 4 ++-- reqmon.spec | 4 ++-- t0_reqmon.spec | 4 ++-- wmagent-dev.spec | 2 +- workqueue.spec | 4 ++-- 10 files changed, 30 insertions(+), 14 deletions(-) create mode 100644 py2-memory_profiler.spec diff --git a/acdcserver.spec b/acdcserver.spec index 9bebf41e1c6..8bb956e2ce9 100644 --- a/acdcserver.spec +++ b/acdcserver.spec @@ -1,4 +1,4 @@ -### RPM cms acdcserver 1.1.13.pre5 +### RPM cms acdcserver 1.1.14.pre1 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} diff --git a/couchskel.spec b/couchskel.spec index 0abba737f7f..251458d2b51 100644 --- a/couchskel.spec +++ b/couchskel.spec @@ -1,4 +1,4 @@ -### RPM cms couchskel 1.1.13.pre5 +### RPM cms couchskel 1.1.14.pre1 Source0: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/%n.tar.gz # External javascripts diff --git a/py2-memory_profiler.spec b/py2-memory_profiler.spec new file mode 100644 index 00000000000..bb09908f364 --- /dev/null +++ b/py2-memory_profiler.spec @@ -0,0 +1,16 @@ +### RPM external py2-memory_profiler 0.52.0 +## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} + +Source: https://files.pythonhosted.org/packages/23/11/50a969d32a14cdec2cfd57bee2e67fd6f83715a04361ba230dbce562b9cb/memory_profiler-%realversion.tar.gz +Requires: python py2-psutil + +%prep +%setup -n memory_profiler-%realversion + +%build +python setup.py build + +%install +python setup.py install --prefix=%i +find %i -name '*.egg-info' -exec rm {} \; +find %i -name '.package-checksum' -exec rm {} \; \ No newline at end of file diff --git a/py2-psutil.spec b/py2-psutil.spec index e1528b9e26d..89d7a681b7b 100644 --- a/py2-psutil.spec +++ b/py2-psutil.spec @@ -1,4 +1,4 @@ -### RPM external py2-psutil 3.2.1 +### RPM external py2-psutil 5.4.5 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} Source: https://pypi.python.org/packages/source/p/psutil/psutil-%realversion.tar.gz diff --git a/reqmgr2.spec b/reqmgr2.spec index 7d03ebd0e44..e0dcd296046 100644 --- a/reqmgr2.spec +++ b/reqmgr2.spec @@ -1,4 +1,4 @@ -### RPM cms reqmgr2 1.1.13.pre5 +### RPM cms reqmgr2 1.1.14.pre1 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} @@ -9,7 +9,7 @@ Source: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/% #Source: git://github.com/ticoann/WMCore?obj=reqmgr2_dashboard_dep/%realversion&export=%n&output=/%n.tar.gz Requires: py2-sqlalchemy py2-httplib2 cherrypy py2-cheetah rotatelogs couchdb15 py2-sphinx py2-pycurl dbs3-client -Requires: py2-future py2-retry py2-stomp +Requires: py2-future py2-retry py2-stomp py2-psutil Requires: jemalloc %prep diff --git a/reqmgr2ms.spec b/reqmgr2ms.spec index ab4c4414ec6..aa40774f0ae 100644 --- a/reqmgr2ms.spec +++ b/reqmgr2ms.spec @@ -1,9 +1,9 @@ -### RPM cms reqmgr2ms 0.0.5.pre5 +### RPM cms reqmgr2ms 0.0.6.pre1 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} -%define wmcorever 1.1.13.pre5 +%define wmcorever 1.1.14.pre1 Source: git://github.com/dmwm/WMCore?obj=master/%wmcorever&export=%n&output=/%n.tar.gz Requires: cherrypy py2-pycurl jemalloc rotatelogs py2-httplib2 diff --git a/reqmon.spec b/reqmon.spec index 802f1f9b8d8..20c708dd1a0 100644 --- a/reqmon.spec +++ b/reqmon.spec @@ -1,4 +1,4 @@ -### RPM cms reqmon 1.1.13.pre5 +### RPM cms reqmon 1.1.14.pre1 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} Source0: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/%n.tar.gz @@ -7,7 +7,7 @@ Source0: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/ #Source: git://github.com/ticoann/WMCore?obj=wmstats_task_summary/%realversion&export=%n&output=/%n.tar.gz Requires: python rotatelogs py2-httplib2 cherrypy py2-cheetah py2-pycurl dbs3-client -Requires: py2-future py2-retry py2-stomp +Requires: py2-future py2-retry py2-stomp py2-psutil Requires: jemalloc BuildRequires: py2-setuptools py2-sphinx couchskel diff --git a/t0_reqmon.spec b/t0_reqmon.spec index 1682796920f..d54cc0dc309 100644 --- a/t0_reqmon.spec +++ b/t0_reqmon.spec @@ -1,9 +1,9 @@ -### RPM cms t0_reqmon 1.1.13.pre5 +### RPM cms t0_reqmon 1.1.14.pre1 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} Source0: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/%n.tar.gz -Requires: python rotatelogs py2-httplib2 cherrypy py2-cheetah py2-pycurl py2-future py2-retry +Requires: python rotatelogs py2-httplib2 cherrypy py2-cheetah py2-pycurl py2-future py2-retry py2-psutil Requires: jemalloc BuildRequires: py2-setuptools py2-sphinx couchskel diff --git a/wmagent-dev.spec b/wmagent-dev.spec index ca957bfb56e..496c867b361 100644 --- a/wmagent-dev.spec +++ b/wmagent-dev.spec @@ -1,4 +1,4 @@ -### RPM cms wmagent-dev 1.1.13.pre5 +### RPM cms wmagent-dev 1.1.14.pre1 # This is a meta-package to group development tool dependencies Requires: wmagent rotatelogs pystack wmcore-devtools diff --git a/workqueue.spec b/workqueue.spec index 6ca40439eee..61acfecc084 100644 --- a/workqueue.spec +++ b/workqueue.spec @@ -1,11 +1,11 @@ -### RPM cms workqueue 1.1.13.pre5 +### RPM cms workqueue 1.1.14.pre1 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} Source: git://github.com/dmwm/WMCore.git?obj=master/%{realversion}&export=%n&output=/%n.tar.gz Requires: python py2-httplib2 pystack rotatelogs couchdb15 yui py2-sphinx dbs3-client cherrypy py2-pycurl -Requires: py2-future py2-retry py2-stomp +Requires: py2-future py2-retry py2-stomp py2-psutil Requires: jemalloc %prep From f934c24558a6b6f1d8d9e4fd14a2c57b45f854cc Mon Sep 17 00:00:00 2001 From: h4d4 Date: Tue, 22 May 2018 11:13:49 +0200 Subject: [PATCH 03/38] Bump HG1806g. --- comp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comp.spec b/comp.spec index e8a72401b1e..42b2ede7800 100644 --- a/comp.spec +++ b/comp.spec @@ -1,4 +1,4 @@ -### RPM cms comp HG1806f +### RPM cms comp HG1806g # This is a meta-package to group all cms comp services # CMSWEB From 3a67e0bc245ada5209174cd24e1c92ab07f8a9c5 Mon Sep 17 00:00:00 2001 From: Alan Malta Rodrigues Date: Tue, 22 May 2018 14:40:52 +0200 Subject: [PATCH 04/38] WMCore 1.1.14.pre2 release candidate (#4021) same for microservices fix this mess fix again and finally the -r option add back the dependencies and psutil and wmagent --- acdcserver.spec | 2 +- couchskel.spec | 2 +- py2-memory_profiler.spec | 2 +- reqmgr2.spec | 4 ++-- reqmgr2ms.spec | 6 +++--- reqmon.spec | 2 +- t0_reqmon.spec | 2 +- wmagent-dev.spec | 2 +- workqueue.spec | 2 +- 9 files changed, 12 insertions(+), 12 deletions(-) diff --git a/acdcserver.spec b/acdcserver.spec index 8bb956e2ce9..5ae104f78a8 100644 --- a/acdcserver.spec +++ b/acdcserver.spec @@ -1,4 +1,4 @@ -### RPM cms acdcserver 1.1.14.pre1 +### RPM cms acdcserver 1.1.14.pre2 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} diff --git a/couchskel.spec b/couchskel.spec index 251458d2b51..cfb90aaea64 100644 --- a/couchskel.spec +++ b/couchskel.spec @@ -1,4 +1,4 @@ -### RPM cms couchskel 1.1.14.pre1 +### RPM cms couchskel 1.1.14.pre2 Source0: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/%n.tar.gz # External javascripts diff --git a/py2-memory_profiler.spec b/py2-memory_profiler.spec index bb09908f364..2acd8523d3e 100644 --- a/py2-memory_profiler.spec +++ b/py2-memory_profiler.spec @@ -13,4 +13,4 @@ python setup.py build %install python setup.py install --prefix=%i find %i -name '*.egg-info' -exec rm {} \; -find %i -name '.package-checksum' -exec rm {} \; \ No newline at end of file +find %i -name '.package-checksum' -exec rm {} \; diff --git a/reqmgr2.spec b/reqmgr2.spec index e0dcd296046..9665bc44e1e 100644 --- a/reqmgr2.spec +++ b/reqmgr2.spec @@ -1,4 +1,4 @@ -### RPM cms reqmgr2 1.1.14.pre1 +### RPM cms reqmgr2 1.1.14.pre2 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} @@ -24,7 +24,7 @@ python setup.py install_system -s reqmgr2 --prefix=%i find %i -name '*.egg-info' -exec rm {} \; mkdir -p %i/bin -cp -pf %_builddir/%n/bin/[[:lower:]]* %i/bin +cp -pfr %_builddir/%n/bin/[[:lower:]]* %i/bin # Generate dependencies-setup.{sh,csh} so init.{sh,csh} picks full environment. mkdir -p %i/etc/profile.d diff --git a/reqmgr2ms.spec b/reqmgr2ms.spec index aa40774f0ae..3edaeca1a4c 100644 --- a/reqmgr2ms.spec +++ b/reqmgr2ms.spec @@ -1,9 +1,9 @@ -### RPM cms reqmgr2ms 0.0.6.pre1 +### RPM cms reqmgr2ms 0.0.6.pre2 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} -%define wmcorever 1.1.14.pre1 +%define wmcorever 1.1.14.pre2 Source: git://github.com/dmwm/WMCore?obj=master/%wmcorever&export=%n&output=/%n.tar.gz Requires: cherrypy py2-pycurl jemalloc rotatelogs py2-httplib2 @@ -21,7 +21,7 @@ python setup.py install_system -s reqmgr2ms --prefix=%i find %i -name '*.egg-info' -exec rm {} \; mkdir -p %i/bin -cp -pf %_builddir/%n/bin/[[:lower:]]* %i/bin +cp -pfr %_builddir/%n/bin/[[:lower:]]* %i/bin # Generate dependencies-setup.{sh,csh} so init.{sh,csh} picks full environment. mkdir -p %i/etc/profile.d diff --git a/reqmon.spec b/reqmon.spec index 20c708dd1a0..c95dbde415c 100644 --- a/reqmon.spec +++ b/reqmon.spec @@ -1,4 +1,4 @@ -### RPM cms reqmon 1.1.14.pre1 +### RPM cms reqmon 1.1.14.pre2 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} Source0: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/%n.tar.gz diff --git a/t0_reqmon.spec b/t0_reqmon.spec index d54cc0dc309..1f856c80acd 100644 --- a/t0_reqmon.spec +++ b/t0_reqmon.spec @@ -1,4 +1,4 @@ -### RPM cms t0_reqmon 1.1.14.pre1 +### RPM cms t0_reqmon 1.1.14.pre2 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} Source0: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/%n.tar.gz diff --git a/wmagent-dev.spec b/wmagent-dev.spec index 496c867b361..1fab3f67fc1 100644 --- a/wmagent-dev.spec +++ b/wmagent-dev.spec @@ -1,4 +1,4 @@ -### RPM cms wmagent-dev 1.1.14.pre1 +### RPM cms wmagent-dev 1.1.14.pre2 # This is a meta-package to group development tool dependencies Requires: wmagent rotatelogs pystack wmcore-devtools diff --git a/workqueue.spec b/workqueue.spec index 61acfecc084..88d6cfffbb5 100644 --- a/workqueue.spec +++ b/workqueue.spec @@ -1,4 +1,4 @@ -### RPM cms workqueue 1.1.14.pre1 +### RPM cms workqueue 1.1.14.pre2 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} From b5fec52d33c1d29da9497cfe2fa8e2f2066dc04b Mon Sep 17 00:00:00 2001 From: h4d4 Date: Tue, 22 May 2018 14:49:38 +0200 Subject: [PATCH 05/38] Bump HG1806h. --- comp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comp.spec b/comp.spec index 42b2ede7800..06273695c42 100644 --- a/comp.spec +++ b/comp.spec @@ -1,4 +1,4 @@ -### RPM cms comp HG1806g +### RPM cms comp HG1806h # This is a meta-package to group all cms comp services # CMSWEB From 0e357f6202027a8b6a9725ded63fa51d593961dc Mon Sep 17 00:00:00 2001 From: Valentin Kuznetsov Date: Thu, 24 May 2018 11:18:17 -0400 Subject: [PATCH 06/38] new das2go version (#4023) * new das2go version * New das2go version with error codes * New das2go version with error codes --- das.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/das.spec b/das.spec index b0c21dc5d95..0b0db28a073 100644 --- a/das.spec +++ b/das.spec @@ -4,7 +4,7 @@ %define pkg0 DAS %define ver0 %realversion %define pkg1 das2go -%define ver1 04.00.07 +%define ver1 04.00.10 Source0: https://github.com/dmwm/%pkg0/archive/%ver0.tar.gz Source1: https://github.com/dmwm/%pkg1/archive/%ver1.tar.gz From a988146e4896f3142d2596d7fbbd4e2e866b2ee2 Mon Sep 17 00:00:00 2001 From: h4d4 Date: Thu, 24 May 2018 17:23:16 +0200 Subject: [PATCH 07/38] Bump HG1806i. --- comp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comp.spec b/comp.spec index 06273695c42..69efe418b84 100644 --- a/comp.spec +++ b/comp.spec @@ -1,4 +1,4 @@ -### RPM cms comp HG1806h +### RPM cms comp HG1806i # This is a meta-package to group all cms comp services # CMSWEB From 848614db1d44d71ad8f60c23091a8f592ae81cca Mon Sep 17 00:00:00 2001 From: Alan Malta Rodrigues Date: Mon, 28 May 2018 12:51:07 +0200 Subject: [PATCH 08/38] WMCore 1.1.14.pre3 release candidate (#4038) --- acdcserver.spec | 2 +- couchskel.spec | 2 +- reqmgr2.spec | 2 +- reqmgr2ms.spec | 4 ++-- reqmon.spec | 2 +- t0_reqmon.spec | 2 +- wmagent-dev.spec | 2 +- workqueue.spec | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/acdcserver.spec b/acdcserver.spec index 5ae104f78a8..2492edddde4 100644 --- a/acdcserver.spec +++ b/acdcserver.spec @@ -1,4 +1,4 @@ -### RPM cms acdcserver 1.1.14.pre2 +### RPM cms acdcserver 1.1.14.pre3 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} diff --git a/couchskel.spec b/couchskel.spec index cfb90aaea64..342a49dd38f 100644 --- a/couchskel.spec +++ b/couchskel.spec @@ -1,4 +1,4 @@ -### RPM cms couchskel 1.1.14.pre2 +### RPM cms couchskel 1.1.14.pre3 Source0: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/%n.tar.gz # External javascripts diff --git a/reqmgr2.spec b/reqmgr2.spec index 9665bc44e1e..aa2f682d8b7 100644 --- a/reqmgr2.spec +++ b/reqmgr2.spec @@ -1,4 +1,4 @@ -### RPM cms reqmgr2 1.1.14.pre2 +### RPM cms reqmgr2 1.1.14.pre3 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} diff --git a/reqmgr2ms.spec b/reqmgr2ms.spec index 3edaeca1a4c..fd935fd9695 100644 --- a/reqmgr2ms.spec +++ b/reqmgr2ms.spec @@ -1,9 +1,9 @@ -### RPM cms reqmgr2ms 0.0.6.pre2 +### RPM cms reqmgr2ms 0.0.6.pre3 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} -%define wmcorever 1.1.14.pre2 +%define wmcorever 1.1.14.pre3 Source: git://github.com/dmwm/WMCore?obj=master/%wmcorever&export=%n&output=/%n.tar.gz Requires: cherrypy py2-pycurl jemalloc rotatelogs py2-httplib2 diff --git a/reqmon.spec b/reqmon.spec index c95dbde415c..e3a8f51a5ba 100644 --- a/reqmon.spec +++ b/reqmon.spec @@ -1,4 +1,4 @@ -### RPM cms reqmon 1.1.14.pre2 +### RPM cms reqmon 1.1.14.pre3 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} Source0: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/%n.tar.gz diff --git a/t0_reqmon.spec b/t0_reqmon.spec index 1f856c80acd..48c401744cb 100644 --- a/t0_reqmon.spec +++ b/t0_reqmon.spec @@ -1,4 +1,4 @@ -### RPM cms t0_reqmon 1.1.14.pre2 +### RPM cms t0_reqmon 1.1.14.pre3 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} Source0: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/%n.tar.gz diff --git a/wmagent-dev.spec b/wmagent-dev.spec index 1fab3f67fc1..a407b791bdc 100644 --- a/wmagent-dev.spec +++ b/wmagent-dev.spec @@ -1,4 +1,4 @@ -### RPM cms wmagent-dev 1.1.14.pre2 +### RPM cms wmagent-dev 1.1.14.pre3 # This is a meta-package to group development tool dependencies Requires: wmagent rotatelogs pystack wmcore-devtools diff --git a/workqueue.spec b/workqueue.spec index 88d6cfffbb5..e299d44953a 100644 --- a/workqueue.spec +++ b/workqueue.spec @@ -1,4 +1,4 @@ -### RPM cms workqueue 1.1.14.pre2 +### RPM cms workqueue 1.1.14.pre3 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} From e664ad0b8a32a5eb4fe3ef3eb577afd3f717a03f Mon Sep 17 00:00:00 2001 From: h4d4 Date: Mon, 28 May 2018 12:56:00 +0200 Subject: [PATCH 09/38] Bump HG1806j. --- comp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comp.spec b/comp.spec index 69efe418b84..147b5ecc227 100644 --- a/comp.spec +++ b/comp.spec @@ -1,4 +1,4 @@ -### RPM cms comp HG1806i +### RPM cms comp HG1806j # This is a meta-package to group all cms comp services # CMSWEB From b61dbe2af6722ccf3469bd51f156ec76708b2b41 Mon Sep 17 00:00:00 2001 From: Valentin Kuznetsov Date: Mon, 28 May 2018 05:05:25 -0400 Subject: [PATCH 10/38] New spec for TFaaS (#3985) --- tfaas.spec | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 tfaas.spec diff --git a/tfaas.spec b/tfaas.spec new file mode 100644 index 00000000000..809dede1a24 --- /dev/null +++ b/tfaas.spec @@ -0,0 +1,74 @@ +### RPM cms tfaas 01.00.00 +## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} + +%define pkg0 TFaaS +%define ver0 v%realversion +Source: https://github.com/vkuznet/%pkg0/archive/%ver0.tar.gz +Requires: autotools go + +# RPM macros documentation +# http://www.rpm.org/max-rpm/s1-rpm-inside-macros.html +%prep +#%setup -b 0 -n %n +%setup -D -T -b 0 -n %pkg0-%realversion + +%build +BUILD_DIR=$PWD +echo "start tfaas build: $PWD" +mkdir -p gopath +export GOPATH=$PWD/gopath +go get github.com/dmwm/cmsauth +go get github.com/vkuznet/x509proxy +go get github.com/sirupsen/logrus +go get github.com/shirou/gopsutil + +# download and insta TensorFlow libraries +# https://www.tensorflow.org/versions/master/install/install_go +WDIR=$PWD +TF_LIB="libtensorflow-cpu-linux-x86_64-1.6.0.tar.gz" +curl -k -L -O "https://storage.googleapis.com/tensorflow/libtensorflow/${TF_LIB}" +tar xfz $TF_LIB +export LIBRARY_PATH="${WDIR}/lib:${LIBRARY_PATH}" +export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${WDIR}/lib" +go get github.com/tensorflow/tensorflow/tensorflow/go +go get github.com/tensorflow/tensorflow/tensorflow/go/op + +# install protobuf +rm -rf protobuf +git clone https://github.com/google/protobuf.git +cd ${WDIR}/protobuf +./autogen.sh +./configure --prefix=${WDIR} +make +make install +go get -u github.com/golang/protobuf/protoc-gen-go + +# build tfaas +cd $WDIR/src/Go +sed -i -e "s,TAG := \$(shell git tag | sort -r | head -n 1),TAG := {TAG},g" Makefile +export TAG=%realversion +sed -i -e "s,{TAG},$TAG,g" Makefile +make + +%install +echo "start tfaas install: $PWD" +echo "build dir $BUILD_DIR" +mkdir -p %i/bin +mkdir -p %i/lib +mkdir -p %i/include +mkdir -p %i/static +mkdir -p %i/models +cp src/Go/tfaas %i/bin +cp -r lib/* %i/lib/ +cp -r include/* %i/include/ +cp -r src/Go/static %i + +# Generate dependencies-setup.{sh,csh} so init.{sh,csh} picks full environment. +%addDependency + +%post +%{relocateConfig}etc/profile.d/dependencies-setup.*sh + +%files +%{installroot}/%{pkgrel}/ +%exclude %{installroot}/%{pkgrel}/doc From 03a843a5269bd8217c571376adc12d26e5092070 Mon Sep 17 00:00:00 2001 From: h4d4 Date: Tue, 29 May 2018 12:06:02 +0200 Subject: [PATCH 11/38] Revert "New spec for TFaaS (#3985)" This reverts commit b61dbe2af6722ccf3469bd51f156ec76708b2b41. TFaaS service can not be included in comp_gcc_493 due to this architecture doesn't include required dependences for TFaaS --- tfaas.spec | 74 ------------------------------------------------------ 1 file changed, 74 deletions(-) delete mode 100644 tfaas.spec diff --git a/tfaas.spec b/tfaas.spec deleted file mode 100644 index 809dede1a24..00000000000 --- a/tfaas.spec +++ /dev/null @@ -1,74 +0,0 @@ -### RPM cms tfaas 01.00.00 -## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} - -%define pkg0 TFaaS -%define ver0 v%realversion -Source: https://github.com/vkuznet/%pkg0/archive/%ver0.tar.gz -Requires: autotools go - -# RPM macros documentation -# http://www.rpm.org/max-rpm/s1-rpm-inside-macros.html -%prep -#%setup -b 0 -n %n -%setup -D -T -b 0 -n %pkg0-%realversion - -%build -BUILD_DIR=$PWD -echo "start tfaas build: $PWD" -mkdir -p gopath -export GOPATH=$PWD/gopath -go get github.com/dmwm/cmsauth -go get github.com/vkuznet/x509proxy -go get github.com/sirupsen/logrus -go get github.com/shirou/gopsutil - -# download and insta TensorFlow libraries -# https://www.tensorflow.org/versions/master/install/install_go -WDIR=$PWD -TF_LIB="libtensorflow-cpu-linux-x86_64-1.6.0.tar.gz" -curl -k -L -O "https://storage.googleapis.com/tensorflow/libtensorflow/${TF_LIB}" -tar xfz $TF_LIB -export LIBRARY_PATH="${WDIR}/lib:${LIBRARY_PATH}" -export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${WDIR}/lib" -go get github.com/tensorflow/tensorflow/tensorflow/go -go get github.com/tensorflow/tensorflow/tensorflow/go/op - -# install protobuf -rm -rf protobuf -git clone https://github.com/google/protobuf.git -cd ${WDIR}/protobuf -./autogen.sh -./configure --prefix=${WDIR} -make -make install -go get -u github.com/golang/protobuf/protoc-gen-go - -# build tfaas -cd $WDIR/src/Go -sed -i -e "s,TAG := \$(shell git tag | sort -r | head -n 1),TAG := {TAG},g" Makefile -export TAG=%realversion -sed -i -e "s,{TAG},$TAG,g" Makefile -make - -%install -echo "start tfaas install: $PWD" -echo "build dir $BUILD_DIR" -mkdir -p %i/bin -mkdir -p %i/lib -mkdir -p %i/include -mkdir -p %i/static -mkdir -p %i/models -cp src/Go/tfaas %i/bin -cp -r lib/* %i/lib/ -cp -r include/* %i/include/ -cp -r src/Go/static %i - -# Generate dependencies-setup.{sh,csh} so init.{sh,csh} picks full environment. -%addDependency - -%post -%{relocateConfig}etc/profile.d/dependencies-setup.*sh - -%files -%{installroot}/%{pkgrel}/ -%exclude %{installroot}/%{pkgrel}/doc From 06bad5ac7ad85e8ea19c47399087e2a8e606111b Mon Sep 17 00:00:00 2001 From: Valentin Kuznetsov Date: Tue, 29 May 2018 03:57:44 -0400 Subject: [PATCH 12/38] New das2go version (remove debug/pprof) (#4045) --- das.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/das.spec b/das.spec index 0b0db28a073..903534bb5cc 100644 --- a/das.spec +++ b/das.spec @@ -4,7 +4,7 @@ %define pkg0 DAS %define ver0 %realversion %define pkg1 das2go -%define ver1 04.00.10 +%define ver1 04.00.11 Source0: https://github.com/dmwm/%pkg0/archive/%ver0.tar.gz Source1: https://github.com/dmwm/%pkg1/archive/%ver1.tar.gz From 2966b4344449a910a7b6486d3f59f78b84751b06 Mon Sep 17 00:00:00 2001 From: h4d4 Date: Tue, 29 May 2018 12:16:56 +0200 Subject: [PATCH 13/38] Bump HG1806k. --- comp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comp.spec b/comp.spec index 147b5ecc227..c65c3ba1060 100644 --- a/comp.spec +++ b/comp.spec @@ -1,4 +1,4 @@ -### RPM cms comp HG1806j +### RPM cms comp HG1806k # This is a meta-package to group all cms comp services # CMSWEB From 9c13ebf403466f276c96b6b3fb5ea654094e95d4 Mon Sep 17 00:00:00 2001 From: Alan Malta Rodrigues Date: Wed, 30 May 2018 15:11:14 +0200 Subject: [PATCH 14/38] WMCore 1.1.14.pre4 release candidate (#4051) --- acdcserver.spec | 2 +- couchskel.spec | 2 +- reqmgr2.spec | 2 +- reqmgr2ms.spec | 4 ++-- reqmon.spec | 2 +- t0_reqmon.spec | 2 +- wmagent-dev.spec | 2 +- workqueue.spec | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/acdcserver.spec b/acdcserver.spec index 2492edddde4..3f9ce78e133 100644 --- a/acdcserver.spec +++ b/acdcserver.spec @@ -1,4 +1,4 @@ -### RPM cms acdcserver 1.1.14.pre3 +### RPM cms acdcserver 1.1.14.pre4 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} diff --git a/couchskel.spec b/couchskel.spec index 342a49dd38f..c62b7898a5f 100644 --- a/couchskel.spec +++ b/couchskel.spec @@ -1,4 +1,4 @@ -### RPM cms couchskel 1.1.14.pre3 +### RPM cms couchskel 1.1.14.pre4 Source0: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/%n.tar.gz # External javascripts diff --git a/reqmgr2.spec b/reqmgr2.spec index aa2f682d8b7..dd2dd849e8c 100644 --- a/reqmgr2.spec +++ b/reqmgr2.spec @@ -1,4 +1,4 @@ -### RPM cms reqmgr2 1.1.14.pre3 +### RPM cms reqmgr2 1.1.14.pre4 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} diff --git a/reqmgr2ms.spec b/reqmgr2ms.spec index fd935fd9695..29e0c8f8e12 100644 --- a/reqmgr2ms.spec +++ b/reqmgr2ms.spec @@ -1,9 +1,9 @@ -### RPM cms reqmgr2ms 0.0.6.pre3 +### RPM cms reqmgr2ms 0.0.6.pre4 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} -%define wmcorever 1.1.14.pre3 +%define wmcorever 1.1.14.pre4 Source: git://github.com/dmwm/WMCore?obj=master/%wmcorever&export=%n&output=/%n.tar.gz Requires: cherrypy py2-pycurl jemalloc rotatelogs py2-httplib2 diff --git a/reqmon.spec b/reqmon.spec index e3a8f51a5ba..e8287ba11e7 100644 --- a/reqmon.spec +++ b/reqmon.spec @@ -1,4 +1,4 @@ -### RPM cms reqmon 1.1.14.pre3 +### RPM cms reqmon 1.1.14.pre4 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} Source0: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/%n.tar.gz diff --git a/t0_reqmon.spec b/t0_reqmon.spec index 48c401744cb..68409e924ee 100644 --- a/t0_reqmon.spec +++ b/t0_reqmon.spec @@ -1,4 +1,4 @@ -### RPM cms t0_reqmon 1.1.14.pre3 +### RPM cms t0_reqmon 1.1.14.pre4 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} Source0: git://github.com/dmwm/WMCore?obj=master/%realversion&export=%n&output=/%n.tar.gz diff --git a/wmagent-dev.spec b/wmagent-dev.spec index a407b791bdc..f643d6aa3bb 100644 --- a/wmagent-dev.spec +++ b/wmagent-dev.spec @@ -1,4 +1,4 @@ -### RPM cms wmagent-dev 1.1.14.pre3 +### RPM cms wmagent-dev 1.1.14.pre4 # This is a meta-package to group development tool dependencies Requires: wmagent rotatelogs pystack wmcore-devtools diff --git a/workqueue.spec b/workqueue.spec index e299d44953a..18230961b3d 100644 --- a/workqueue.spec +++ b/workqueue.spec @@ -1,4 +1,4 @@ -### RPM cms workqueue 1.1.14.pre3 +### RPM cms workqueue 1.1.14.pre4 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} From f5872128a9ffd92e8df20ad5c46e95caf63528eb Mon Sep 17 00:00:00 2001 From: h4d4 Date: Wed, 30 May 2018 15:25:22 +0200 Subject: [PATCH 15/38] Bump HG1806l --- comp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comp.spec b/comp.spec index c65c3ba1060..7ebc95c2676 100644 --- a/comp.spec +++ b/comp.spec @@ -1,4 +1,4 @@ -### RPM cms comp HG1806k +### RPM cms comp HG1806l # This is a meta-package to group all cms comp services # CMSWEB From 9a093080876403c30555ae3f5a1c0b0222d6c5ff Mon Sep 17 00:00:00 2001 From: h4d4 Date: Thu, 31 May 2018 10:41:41 +0200 Subject: [PATCH 16/38] Bump HG1806m. --- comp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comp.spec b/comp.spec index 7ebc95c2676..bfae6f6c82f 100644 --- a/comp.spec +++ b/comp.spec @@ -1,4 +1,4 @@ -### RPM cms comp HG1806l +### RPM cms comp HG1806m # This is a meta-package to group all cms comp services # CMSWEB From 6205322c422d03c613bd60a27c642949f2b7eb69 Mon Sep 17 00:00:00 2001 From: Todor Ivanov Date: Wed, 6 Jun 2018 10:46:12 +0200 Subject: [PATCH 17/38] CRABTaskWorker 3.3.1806 --- crabtaskworker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crabtaskworker.spec b/crabtaskworker.spec index 4ac3d5d4dab..91044daf909 100644 --- a/crabtaskworker.spec +++ b/crabtaskworker.spec @@ -1,4 +1,4 @@ -### RPM cms crabtaskworker 3.3.1805.rc1 +### RPM cms crabtaskworker 3.3.1806 ## INITENV +PATH PATH %i/xbin From 6249d4d551ca5d43306197bcb3d314d93422e798 Mon Sep 17 00:00:00 2001 From: Todor Ivanov Date: Wed, 6 Jun 2018 12:40:34 +0200 Subject: [PATCH 18/38] fixing wmcore version for crabtaskworkier 3.3.1806 --- crabtaskworker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crabtaskworker.spec b/crabtaskworker.spec index 91044daf909..6a807c99cd1 100644 --- a/crabtaskworker.spec +++ b/crabtaskworker.spec @@ -6,7 +6,7 @@ ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} %define webdoc_files %{installroot}/%{pkgrel}/doc/ -%define wmcver 1.1.2.crab7 +%define wmcver 1.1.2.crab8 Source0: git://github.com/dmwm/WMCore.git?obj=master/%{wmcver}&export=WMCore-%{wmcver}&output=/WMCore-%{n}-%{wmcver}.tar.gz Source1: git://github.com/dmwm/CRABServer.git?obj=master/%{realversion}&export=CRABServer-%{realversion}&output=/CRABServer-%{realversion}.tar.gz From 40bdfa3825c4775789b71ded7e88ca0577a54a68 Mon Sep 17 00:00:00 2001 From: amaltaro Date: Mon, 4 Jun 2018 14:58:27 +0200 Subject: [PATCH 19/38] WMAgent stable release 1.1.12.patch5 --- wmagent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wmagent.spec b/wmagent.spec index 407c96c0b0a..c31b87db4f0 100644 --- a/wmagent.spec +++ b/wmagent.spec @@ -1,4 +1,4 @@ -### RPM cms wmagent 1.1.12.patch4 +### RPM cms wmagent 1.1.12.patch5 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} From 636aac01dd31409751df59dd0bbc284b3f42ac4b Mon Sep 17 00:00:00 2001 From: amaltaro Date: Wed, 6 Jun 2018 15:48:15 +0200 Subject: [PATCH 20/38] WMAgent release candidate 1.1.14.patch1 --- wmagent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wmagent.spec b/wmagent.spec index c31b87db4f0..6bab347ee8d 100644 --- a/wmagent.spec +++ b/wmagent.spec @@ -1,4 +1,4 @@ -### RPM cms wmagent 1.1.12.patch5 +### RPM cms wmagent 1.1.14.patch1 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} From 74976d62eaaaf628cc2a261b840ebd5761fdb597 Mon Sep 17 00:00:00 2001 From: Valentin Kuznetsov Date: Tue, 12 Jun 2018 05:24:50 -0400 Subject: [PATCH 21/38] New das release (#4096) --- das.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/das.spec b/das.spec index 903534bb5cc..d4ca1d3e4f0 100644 --- a/das.spec +++ b/das.spec @@ -4,7 +4,7 @@ %define pkg0 DAS %define ver0 %realversion %define pkg1 das2go -%define ver1 04.00.11 +%define ver1 04.01.00 Source0: https://github.com/dmwm/%pkg0/archive/%ver0.tar.gz Source1: https://github.com/dmwm/%pkg1/archive/%ver1.tar.gz From 70edd4956e6190a30afb20b8bde969ed8d84d158 Mon Sep 17 00:00:00 2001 From: h4d4 Date: Tue, 12 Jun 2018 11:29:13 +0200 Subject: [PATCH 22/38] Bump HG1806n. --- comp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comp.spec b/comp.spec index bfae6f6c82f..3e8c3909971 100644 --- a/comp.spec +++ b/comp.spec @@ -1,4 +1,4 @@ -### RPM cms comp HG1806m +### RPM cms comp HG1806n # This is a meta-package to group all cms comp services # CMSWEB From 2d1dba533f1832e58a513c80c33fb3e392ac8ef2 Mon Sep 17 00:00:00 2001 From: Valentin Kuznetsov Date: Tue, 12 Jun 2018 10:59:18 -0400 Subject: [PATCH 23/38] New das2go release (#4107) --- das.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/das.spec b/das.spec index d4ca1d3e4f0..6ca902904a6 100644 --- a/das.spec +++ b/das.spec @@ -4,7 +4,7 @@ %define pkg0 DAS %define ver0 %realversion %define pkg1 das2go -%define ver1 04.01.00 +%define ver1 04.01.04 Source0: https://github.com/dmwm/%pkg0/archive/%ver0.tar.gz Source1: https://github.com/dmwm/%pkg1/archive/%ver1.tar.gz From 0e3b866231a27d8a0622ac0339f6ecea76803112 Mon Sep 17 00:00:00 2001 From: h4d4 Date: Tue, 12 Jun 2018 17:08:22 +0200 Subject: [PATCH 24/38] Bump HG1806o. --- comp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comp.spec b/comp.spec index 3e8c3909971..1cf6f48f70c 100644 --- a/comp.spec +++ b/comp.spec @@ -1,4 +1,4 @@ -### RPM cms comp HG1806n +### RPM cms comp HG1806o # This is a meta-package to group all cms comp services # CMSWEB From 9cad58fd005d532fa0568961d2adc80aadb61cd3 Mon Sep 17 00:00:00 2001 From: Alan Malta Rodrigues Date: Sat, 16 Jun 2018 09:25:14 +0200 Subject: [PATCH 25/38] WMagent stable 1.1.14.patch2 --- wmagent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wmagent.spec b/wmagent.spec index 6bab347ee8d..a6d3bdbbcbe 100644 --- a/wmagent.spec +++ b/wmagent.spec @@ -1,4 +1,4 @@ -### RPM cms wmagent 1.1.14.patch1 +### RPM cms wmagent 1.1.14.patch2 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} From d77245919489bffaa0e940e4d1f7cd66982ce739 Mon Sep 17 00:00:00 2001 From: Valentin Kuznetsov Date: Tue, 19 Jun 2018 06:27:08 -0400 Subject: [PATCH 26/38] New release for TFaaS (#4116) * New release for TFaaS * Add rotatelogs Conflicts: tfaas.spec --- tfaas.spec | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 74 insertions(+) create mode 100644 tfaas.spec diff --git a/tfaas.spec b/tfaas.spec new file mode 100644 index 00000000000..595b170efe7 --- /dev/null +++ b/tfaas.spec @@ -0,0 +1,74 @@ +### RPM cms tfaas 01.00.04 +## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} + +%define pkg0 TFaaS +%define ver0 v%realversion +Source: https://github.com/vkuznet/%pkg0/archive/%ver0.tar.gz +Requires: autotools go rotatelogs + +# RPM macros documentation +# http://www.rpm.org/max-rpm/s1-rpm-inside-macros.html +%prep +#%setup -b 0 -n %n +%setup -D -T -b 0 -n %pkg0-%realversion + +%build +BUILD_DIR=$PWD +echo "start tfaas build: $PWD" +mkdir -p gopath +export GOPATH=$PWD/gopath +go get github.com/dmwm/cmsauth +go get github.com/vkuznet/x509proxy +go get github.com/sirupsen/logrus +go get github.com/shirou/gopsutil + +# download and insta TensorFlow libraries +# https://www.tensorflow.org/versions/master/install/install_go +WDIR=$PWD +TF_LIB="libtensorflow-cpu-linux-x86_64-1.6.0.tar.gz" +curl -k -L -O "https://storage.googleapis.com/tensorflow/libtensorflow/${TF_LIB}" +tar xfz $TF_LIB +export LIBRARY_PATH="${WDIR}/lib:${LIBRARY_PATH}" +export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${WDIR}/lib" +go get github.com/tensorflow/tensorflow/tensorflow/go +go get github.com/tensorflow/tensorflow/tensorflow/go/op + +# install protobuf +rm -rf protobuf +git clone https://github.com/google/protobuf.git +cd ${WDIR}/protobuf +./autogen.sh +./configure --prefix=${WDIR} +make +make install +go get -u github.com/golang/protobuf/protoc-gen-go + +# build tfaas +cd $WDIR/src/Go +sed -i -e "s,TAG := \$(shell git tag | sort -r | head -n 1),TAG := {TAG},g" Makefile +export TAG=%realversion +sed -i -e "s,{TAG},$TAG,g" Makefile +make + +%install +echo "start tfaas install: $PWD" +echo "build dir $BUILD_DIR" +mkdir -p %i/bin +mkdir -p %i/lib +mkdir -p %i/include +mkdir -p %i/static +mkdir -p %i/models +cp src/Go/tfaas %i/bin +cp -r lib/* %i/lib/ +cp -r include/* %i/include/ +cp -r src/Go/static %i + +# Generate dependencies-setup.{sh,csh} so init.{sh,csh} picks full environment. +%addDependency + +%post +%{relocateConfig}etc/profile.d/dependencies-setup.*sh + +%files +%{installroot}/%{pkgrel}/ +%exclude %{installroot}/%{pkgrel}/doc From 012a96184d2d4f89c4050566bf780054bcedb460 Mon Sep 17 00:00:00 2001 From: h4d4 Date: Tue, 19 Jun 2018 16:23:41 +0200 Subject: [PATCH 27/38] Bump HG1807a. From 608fea43a5a18076125215daea9b46b28faa769c Mon Sep 17 00:00:00 2001 From: h4d4 Date: Tue, 19 Jun 2018 19:59:51 +0200 Subject: [PATCH 28/38] Fixing skiped correct tag HG1807a --- comp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comp.spec b/comp.spec index 1cf6f48f70c..5db491cd993 100644 --- a/comp.spec +++ b/comp.spec @@ -1,4 +1,4 @@ -### RPM cms comp HG1806o +### RPM cms comp HG1807a # This is a meta-package to group all cms comp services # CMSWEB From 5839feb62fe653caa396ad9cbff310f8d886b0b0 Mon Sep 17 00:00:00 2001 From: Stefano Belforte Date: Wed, 27 Jun 2018 12:15:39 +0200 Subject: [PATCH 29/38] use crabserver 3.3.1807.rc1 (#4139) --- crabserver.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crabserver.spec b/crabserver.spec index 262e06abed4..61ffe2e20ec 100644 --- a/crabserver.spec +++ b/crabserver.spec @@ -1,5 +1,5 @@ -### RPM cms crabserver 3.3.1805.rc1 +### RPM cms crabserver 3.3.1807.rc1 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} From 79f891b2c76a114c8600e32074b77b88e1fc2ab2 Mon Sep 17 00:00:00 2001 From: h4d4 Date: Wed, 27 Jun 2018 13:05:35 +0200 Subject: [PATCH 30/38] Bump HG1807b --- comp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comp.spec b/comp.spec index 5db491cd993..0678d211205 100644 --- a/comp.spec +++ b/comp.spec @@ -1,4 +1,4 @@ -### RPM cms comp HG1807a +### RPM cms comp HG1807b # This is a meta-package to group all cms comp services # CMSWEB From 501ddd3e9053b3a2aae4fef27d8802145f773952 Mon Sep 17 00:00:00 2001 From: amaltaro Date: Wed, 27 Jun 2018 10:06:13 +0200 Subject: [PATCH 31/38] WMAgent 1.1.14.patch4 --- wmagent.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wmagent.spec b/wmagent.spec index a6d3bdbbcbe..37699c22794 100644 --- a/wmagent.spec +++ b/wmagent.spec @@ -1,4 +1,4 @@ -### RPM cms wmagent 1.1.14.patch2 +### RPM cms wmagent 1.1.14.patch4 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} From 25d3ebb71e60ea388aaf7a6bf3504dd2dd34665b Mon Sep 17 00:00:00 2001 From: Valentin Kuznetsov Date: Thu, 28 Jun 2018 04:47:38 -0400 Subject: [PATCH 32/38] New TFaaS version (#4159) --- tfaas.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tfaas.spec b/tfaas.spec index 595b170efe7..a1b5eb4db3f 100644 --- a/tfaas.spec +++ b/tfaas.spec @@ -1,4 +1,4 @@ -### RPM cms tfaas 01.00.04 +### RPM cms tfaas 01.00.05 ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} %define pkg0 TFaaS From 5b8ae2a532b57d393a904a0b53b30840bd3e99b5 Mon Sep 17 00:00:00 2001 From: h4d4 Date: Thu, 28 Jun 2018 12:41:58 +0200 Subject: [PATCH 33/38] Bump HG1807c. --- comp.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/comp.spec b/comp.spec index 0678d211205..33adc84f548 100644 --- a/comp.spec +++ b/comp.spec @@ -1,4 +1,4 @@ -### RPM cms comp HG1807b +### RPM cms comp HG1807c # This is a meta-package to group all cms comp services # CMSWEB From 8732d02291c4380b6563784882ce495ca285506d Mon Sep 17 00:00:00 2001 From: Stefano Belforte Date: Tue, 24 Jul 2018 17:43:13 +0200 Subject: [PATCH 34/38] new wmcore (#4197) --- crabserver.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/crabserver.spec b/crabserver.spec index 61ffe2e20ec..85f5f7a86ff 100644 --- a/crabserver.spec +++ b/crabserver.spec @@ -1,5 +1,4 @@ - -### RPM cms crabserver 3.3.1807.rc1 +### RPM cms crabserver 3.3.1809.rc3 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} @@ -7,7 +6,7 @@ %define webdoc_files %{installroot}/%{pkgrel}/doc/ -%define wmcver 1.1.2.crab4 +%define wmcver 1.1.14.crab1 Source0: git://github.com/dmwm/WMCore.git?obj=master/%{wmcver}&export=WMCore-%{wmcver}&output=/WMCore-%{n}-%{wmcver}.tar.gz Source1: git://github.com/dmwm/CRABServer.git?obj=master/%{realversion}&export=CRABServer-%{realversion}&output=/CRABServer-%{realversion}.tar.gz From 0de2f4066f8df36ea68975d626a7a9ee62deaaeb Mon Sep 17 00:00:00 2001 From: Todor Ivanov Date: Mon, 13 Aug 2018 15:33:27 +0200 Subject: [PATCH 35/38] crabtaskworkrer 3.3807.rc1 --- crabtaskworker.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crabtaskworker.spec b/crabtaskworker.spec index 6a807c99cd1..6c75ade0e0e 100644 --- a/crabtaskworker.spec +++ b/crabtaskworker.spec @@ -1,4 +1,4 @@ -### RPM cms crabtaskworker 3.3.1806 +### RPM cms crabtaskworker 3.3.1807.rc1 ## INITENV +PATH PATH %i/xbin From 2ae5c71982ab938541bbcadd5e197ef037722810 Mon Sep 17 00:00:00 2001 From: Todor Ivanov Date: Tue, 4 Sep 2018 11:29:42 +0200 Subject: [PATCH 36/38] crabtaskworker 3.3.1809.rc8 --- crabtaskworker.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crabtaskworker.spec b/crabtaskworker.spec index 6c75ade0e0e..04a39e0e007 100644 --- a/crabtaskworker.spec +++ b/crabtaskworker.spec @@ -1,4 +1,4 @@ -### RPM cms crabtaskworker 3.3.1807.rc1 +### RPM cms crabtaskworker 3.3.1809.rc8 ## INITENV +PATH PATH %i/xbin @@ -6,7 +6,7 @@ ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} %define webdoc_files %{installroot}/%{pkgrel}/doc/ -%define wmcver 1.1.2.crab8 +%define wmcver 1.1.16.pre3 Source0: git://github.com/dmwm/WMCore.git?obj=master/%{wmcver}&export=WMCore-%{wmcver}&output=/WMCore-%{n}-%{wmcver}.tar.gz Source1: git://github.com/dmwm/CRABServer.git?obj=master/%{realversion}&export=CRABServer-%{realversion}&output=/CRABServer-%{realversion}.tar.gz From 8afc3134a9f6fe2d9bbf4409f27f8c1f12d3cc12 Mon Sep 17 00:00:00 2001 From: Leonardo Cristella Date: Sat, 8 Sep 2018 16:25:46 -0300 Subject: [PATCH 37/38] Revert "Temporary revert to allow for testing" --- crabclient.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crabclient.spec b/crabclient.spec index 701330caeab..0cd13520e5a 100644 --- a/crabclient.spec +++ b/crabclient.spec @@ -1,12 +1,12 @@ -### RPM cms crabclient 3.3.1809 +### RPM cms crabclient 3.3.1810.rc1 ## INITENV +PATH PATH %i/xbin ## INITENV +PATH PYTHONPATH %i/${PYTHON_LIB_SITE_PACKAGES} ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} #branch 1.1.2_crab -%define wmcver 1.1.2.crab7 +%define wmcver 1.1.16 %define webdoc_files %{installroot}/%{pkgrel}/doc/ -%define crabserver 3.3.1710.rc1 +%define crabserver 3.3.1809.rc8 Source0: git://github.com/dmwm/WMCore.git?obj=master/%{wmcver}&export=WMCore-%{wmcver}&output=/WMCore-%{n}-%{wmcver}.tar.gz From d9c203160586e49fc0c0a2e874bfbe91a4abe5cd Mon Sep 17 00:00:00 2001 From: Leonardo Cristella Date: Tue, 9 Oct 2018 23:11:52 +0200 Subject: [PATCH 38/38] crabTaskWorker 3.3.1810.patch4 and WMCore 1.1.17.pre3 Using only blocks with locations in checkBlocksSize function to avoid Exception from DBS API --- crabtaskworker.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/crabtaskworker.spec b/crabtaskworker.spec index 04a39e0e007..765dbc01cd4 100644 --- a/crabtaskworker.spec +++ b/crabtaskworker.spec @@ -1,4 +1,4 @@ -### RPM cms crabtaskworker 3.3.1809.rc8 +### RPM cms crabtaskworker 3.3.1810.patch4 ## INITENV +PATH PATH %i/xbin @@ -6,7 +6,7 @@ ## INITENV +PATH PYTHONPATH %i/x${PYTHON_LIB_SITE_PACKAGES} %define webdoc_files %{installroot}/%{pkgrel}/doc/ -%define wmcver 1.1.16.pre3 +%define wmcver 1.1.17.pre3 Source0: git://github.com/dmwm/WMCore.git?obj=master/%{wmcver}&export=WMCore-%{wmcver}&output=/WMCore-%{n}-%{wmcver}.tar.gz Source1: git://github.com/dmwm/CRABServer.git?obj=master/%{realversion}&export=CRABServer-%{realversion}&output=/CRABServer-%{realversion}.tar.gz