From d4ad51cdaff1f0ea04f591ae672957bb26e6d9c7 Mon Sep 17 00:00:00 2001 From: Faustin Lammler Date: Mon, 22 Apr 2024 17:24:44 +0200 Subject: [PATCH] Function for env print And add information about CPU --- common_factories.py | 14 +------ master-docker-nonstandard-2/master.cfg | 56 ++++---------------------- master-docker-nonstandard/master.cfg | 56 ++++---------------------- master.cfg | 7 +--- utils.py | 18 +++++++++ 5 files changed, 37 insertions(+), 114 deletions(-) diff --git a/common_factories.py b/common_factories.py index d921dedb..6f39e913 100644 --- a/common_factories.py +++ b/common_factories.py @@ -161,12 +161,7 @@ def addPostTests(f_quick_build): def getBuildFactoryPreTest(build_type="RelWithDebInfo", additional_args=""): f_quick_build = util.BuildFactory() - f_quick_build.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) - ) + f_quick_build.addStep(printEnv()) f_quick_build.addStep( steps.SetProperty( property="dockerfile", @@ -364,12 +359,7 @@ def getTests(props): def getRpmAutobakeFactory(mtrDbPool): ## f_rpm_autobake f_rpm_autobake = util.BuildFactory() - f_rpm_autobake.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) - ) + f_rpm_autobake.addStep(printEnv()) f_rpm_autobake.addStep( steps.SetProperty( property="dockerfile", diff --git a/master-docker-nonstandard-2/master.cfg b/master-docker-nonstandard-2/master.cfg index 0e299587..a4710a02 100644 --- a/master-docker-nonstandard-2/master.cfg +++ b/master-docker-nonstandard-2/master.cfg @@ -181,12 +181,7 @@ f_rpm_autobake = getRpmAutobakeFactory(mtrDbPool) ## f_asan_ubsan_build f_asan_ubsan_build = util.BuildFactory() -f_asan_ubsan_build.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) -) +f_asan_ubsan_build.addStep(printEnv()) f_asan_ubsan_build.addStep( steps.SetProperty( property="dockerfile", @@ -295,12 +290,7 @@ f_asan_ubsan_build.addStep( ## f_asan_build f_asan_build = util.BuildFactory() -f_asan_build.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) -) +f_asan_build.addStep(printEnv()) f_asan_build.addStep( steps.SetProperty( property="dockerfile", @@ -409,12 +399,7 @@ f_asan_build.addStep( ## f_msan_build f_msan_build = util.BuildFactory() -f_msan_build.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) -) +f_msan_build.addStep(printEnv()) f_msan_build.addStep( steps.SetProperty( property="dockerfile", @@ -517,12 +502,7 @@ f_msan_build.addStep( ## f_valgrind_build f_valgrind_build = util.BuildFactory() -f_valgrind_build.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) -) +f_valgrind_build.addStep(printEnv()) f_valgrind_build.addStep( steps.SetProperty( property="dockerfile", @@ -622,12 +602,7 @@ f_valgrind_build.addStep( ## f_big_test f_big_test = util.BuildFactory() -f_big_test.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) -) +f_big_test.addStep(printEnv()) f_big_test.addStep( steps.SetProperty( property="dockerfile", @@ -829,12 +804,7 @@ def add_test_steps(factory, test_types): ## f_full_test f_full_test = util.BuildFactory() -f_full_test.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) -) +f_full_test.addStep(printEnv()) f_full_test.addStep( steps.SetProperty( property="dockerfile", @@ -895,12 +865,7 @@ f_full_test.addStep( ## f_without_server f_without_server = util.BuildFactory() -f_without_server.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) -) +f_without_server.addStep(printEnv()) f_without_server.addStep( steps.SetProperty( property="dockerfile", @@ -1115,12 +1080,7 @@ f_eco_mysqljs.addStep( ## f_bintar f_bintar = util.BuildFactory() -f_bintar.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) -) +f_bintar.addStep(printEnv()) f_bintar.addStep( steps.SetProperty( property="dockerfile", diff --git a/master-docker-nonstandard/master.cfg b/master-docker-nonstandard/master.cfg index 00ef5262..9422a83b 100644 --- a/master-docker-nonstandard/master.cfg +++ b/master-docker-nonstandard/master.cfg @@ -428,12 +428,7 @@ f_rpm_autobake = getRpmAutobakeFactory(mtrDbPool) ## f_asan_ubsan_build f_asan_ubsan_build = util.BuildFactory() -f_asan_ubsan_build.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) -) +f_asan_ubsan_build.addStep(printEnv()) f_asan_ubsan_build.addStep( steps.SetProperty( property="dockerfile", @@ -542,12 +537,7 @@ f_asan_ubsan_build.addStep( ## f_asan_build f_asan_build = util.BuildFactory() -f_asan_build.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) -) +f_asan_build.addStep(printEnv()) f_asan_build.addStep( steps.SetProperty( property="dockerfile", @@ -656,12 +646,7 @@ f_asan_build.addStep( ## f_msan_build f_msan_build = util.BuildFactory() -f_msan_build.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) -) +f_msan_build.addStep(printEnv()) f_msan_build.addStep( steps.SetProperty( property="dockerfile", @@ -764,12 +749,7 @@ f_msan_build.addStep( ## f_valgrind_build f_valgrind_build = util.BuildFactory() -f_valgrind_build.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) -) +f_valgrind_build.addStep(printEnv()) f_valgrind_build.addStep( steps.SetProperty( property="dockerfile", @@ -869,12 +849,7 @@ f_valgrind_build.addStep( ## f_big_test f_big_test = util.BuildFactory() -f_big_test.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) -) +f_big_test.addStep(printEnv()) f_big_test.addStep( steps.SetProperty( property="dockerfile", @@ -1076,12 +1051,7 @@ def add_test_steps(factory, test_types): ## f_full_test f_full_test = util.BuildFactory() -f_full_test.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) -) +f_full_test.addStep(printEnv()) f_full_test.addStep( steps.SetProperty( property="dockerfile", @@ -1142,12 +1112,7 @@ f_full_test.addStep( ## f_without_server f_without_server = util.BuildFactory() -f_without_server.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) -) +f_without_server.addStep(printEnv()) f_without_server.addStep( steps.SetProperty( property="dockerfile", @@ -1362,12 +1327,7 @@ f_eco_mysqljs.addStep( ## f_bintar f_bintar = util.BuildFactory() -f_bintar.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) -) +f_bintar.addStep(printEnv()) f_bintar.addStep( steps.SetProperty( property="dockerfile", diff --git a/master.cfg b/master.cfg index 84bbad5e..4ea1f311 100644 --- a/master.cfg +++ b/master.cfg @@ -174,12 +174,7 @@ f_rpm_autobake = getRpmAutobakeFactory(mtrDbPool) ## f_deb_autobake f_deb_autobake = util.BuildFactory() -f_deb_autobake.addStep( - steps.ShellCommand( - name="Environment details", - command=["bash", "-c", "date -u && uname -a && ulimit -a"], - ) -) +f_deb_autobake.addStep(printEnv()) f_deb_autobake.addStep( steps.SetProperty( property="dockerfile", diff --git a/utils.py b/utils.py index b35575e0..e24d8e8f 100644 --- a/utils.py +++ b/utils.py @@ -136,6 +136,24 @@ def createWorker( return ((base_name, name + worker_name_suffix), worker_instance) +def printEnv(): + return ShellCommand( + name="Environment details", + command=[ + "bash", + "-c", + util.Interpolate( + """ + date -u + uname -a + ulimit -a + command -v lscpu >/dev/null && lscpu + """ + ), + ], + ) + + def getSourceTarball(): return ShellCommand( name="get_tarball",