From fb1a42b3c6adb586af23f493cf3bb6f3c902f12c Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Thu, 18 Jul 2024 18:04:46 +0200 Subject: [PATCH 1/7] Install all build_requires on Alma9 as well (#1370) --- publish/aliPublish.conf | 46 +++++++++++++++++++++++++++-------------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/publish/aliPublish.conf b/publish/aliPublish.conf index f6b507ef..9b215ffc 100644 --- a/publish/aliPublish.conf +++ b/publish/aliPublish.conf @@ -344,27 +344,43 @@ architectures: AliEn: el9-x86_64 RPM: false include: - grid-base-packages: true - googlebenchmark: true - json-c: true - MPFR: true - ITSResponse: true - defaults-release: true - alibuild-recipe-tools: true - Python-modules-list: true - double-conversion: true - FairCMakeModules: true - Alice-GRID-Utils: true - libwebsockets: true AliEn-CAs: true + Alice-GRID-Utils: true ApMon-CPP: true - GMP: true - capstone: true CMake: true + CodingGuidelines: true + FairCMakeModules: true + GMP: true + HEPscore-CCDB: true + ITSResponse: true + IgProf: true + MCSingContainer: true + MPFR: true + O2-customization: true + Python-modules-list: true + QualityControl: true + RapidJSON: true + UUID: true abseil: true + alibuild-recipe-tools: true + autotools: true bz2: true + capstone: true + cub: true + defaults-release: true + double-conversion: true + flatbuffers: true + fmt: true + googlebenchmark: true + googletest: true + grid-base-packages: true + hijing: true + json-c: true + libtirpc: true + libwebsockets: true ninja: true - IgProf: true + oniguruma: true + re2: true O2PDPSuite: - ^async-.*$ # Tags for testing compatibility with Hyperloop. From b902cd3b61b14ddc99897b1ebfaaf1fa703b5974 Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Fri, 19 Jul 2024 10:58:27 +0200 Subject: [PATCH 2/7] Use packaging 23 with python3.6 (#1372) --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 0d93d271..8bbce35d 100644 --- a/setup.py +++ b/setup.py @@ -40,7 +40,7 @@ # The 7.* series removed support for Python 3.6. 'setuptools_scm<7.0.0' if sys.version_info < (3, 7) else 'setuptools_scm' - ], + ] + ['packaging<=23'] if sys.version_info <(3, 7) else [], description='ALICE Multipurpose bot', long_description=long_description, From a90ea8105b12478a8bd4d680120f42b75b1209e0 Mon Sep 17 00:00:00 2001 From: Sergio Garcia <47090312+singiamtel@users.noreply.github.com> Date: Fri, 19 Jul 2024 12:30:09 +0200 Subject: [PATCH 3/7] Upgrade alibuild tag for old centOS versions (#1374) --- .github/workflows/o2-full-deps.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/o2-full-deps.yml b/.github/workflows/o2-full-deps.yml index a99754e8..5222726f 100644 --- a/.github/workflows/o2-full-deps.yml +++ b/.github/workflows/o2-full-deps.yml @@ -27,10 +27,10 @@ jobs: include: - el_version: el7 container: centos:7 - alibuild_tag: v1.17.7 + alibuild_tag: v1.17.8 - el_version: el8 container: almalinux:8 - alibuild_tag: v1.17.7 + alibuild_tag: v1.17.8 - el_version: el9 container: almalinux:9 alibuild_tag: v1.17.7 From 5b3cc6c3e9942bc3b42010ae56c12445e48e48f8 Mon Sep 17 00:00:00 2001 From: Sergio Garcia <47090312+singiamtel@users.noreply.github.com> Date: Fri, 19 Jul 2024 12:46:54 +0200 Subject: [PATCH 4/7] Bump alibuild in old yum repos (#1375) --- .github/workflows/o2-full-deps.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/o2-full-deps.yml b/.github/workflows/o2-full-deps.yml index 5222726f..1e088dcb 100644 --- a/.github/workflows/o2-full-deps.yml +++ b/.github/workflows/o2-full-deps.yml @@ -27,10 +27,10 @@ jobs: include: - el_version: el7 container: centos:7 - alibuild_tag: v1.17.8 + alibuild_tag: v1.17.9 - el_version: el8 container: almalinux:8 - alibuild_tag: v1.17.8 + alibuild_tag: v1.17.9 - el_version: el9 container: almalinux:9 alibuild_tag: v1.17.7 From 52d2b247b679ff41aff88a748fc42a6c6f88ed57 Mon Sep 17 00:00:00 2001 From: Sergio Garcia <47090312+singiamtel@users.noreply.github.com> Date: Fri, 19 Jul 2024 13:18:39 +0200 Subject: [PATCH 5/7] Remove outdated test (#1373) --- test/test_githubCachedRequest.py | 37 -------------------------------- 1 file changed, 37 deletions(-) delete mode 100644 test/test_githubCachedRequest.py diff --git a/test/test_githubCachedRequest.py b/test/test_githubCachedRequest.py deleted file mode 100644 index d86fbac7..00000000 --- a/test/test_githubCachedRequest.py +++ /dev/null @@ -1,37 +0,0 @@ -from alibot_helpers.github_utilities import GithubCachedClient -import os - -client = GithubCachedClient(api="https://api.github.com", - token=os.environ["GITHUB_TOKEN"]) - -client.loadCache(".test_cache") -print client.request("GET", "/rate_limit") -for x in client.request("GET", "/repos/alisw/AliPhysics/commits/31bd7c7/statuses?per_page=1"): - print x["context"] -print client.request("GET", "/rate_limit") -print client.request("GET", "/rate_limit") -client.request("GET", "/teams/{team_id}/memberships/{user}", team_id=2293164, user="ktf") -client.request("GET", "/teams/{team_id}/memberships/{user}", team_id=2293164, user="ktf") -client.request("GET", "/teams/{team_id}/memberships/{user}", team_id=2293164, user="ktf") -client.request("GET", "/teams/{team_id}/memberships/{user}", team_id=2293164, user="ktf") -client.request("GET", "/teams/{team_id}/memberships/{user}", team_id=2293164, user="ktf") -client.request("GET", "/teams/{team_id}/memberships/{user}", team_id=2293164, user="ktf") -print client.request("GET", "/rate_limit") - -print client.request("GET", "/rate_limit") -client.request("GET", "/repos/alisw/AliRoot/collaborators/ktf/permission", stable_api=False) -client.request("GET", "/repos/alisw/AliRoot/collaborators/bal/permission", stable_api=False) -client.request("GET", "/rate_limit") -client.request("GET", "/repos/alisw/AliRoot/collaborators/ktf/permission", stable_api=False) -client.request("GET", "/repos/alisw/AliRoot/collaborators/bal/permission", stable_api=False) -old_remaining = client.request("GET", "/rate_limit")["rate"]["remaining"] -client.dumpCache(".test_cache") - -client2 = GithubCachedClient(api="https://api.github.com", - token=os.environ["GITHUB_TOKEN"]) -client2.loadCache(".test_cache") -client2.request("GET", "/repos/alisw/AliRoot/collaborators/ktf/permission", stable_api=False) -client2.request("GET", "/repos/alisw/AliRoot/collaborators/bal/permission", stable_api=False) -new_remaining = client2.request("GET", "/rate_limit")["rate"]["remaining"] -print new_remaining, old_remaining - From 3a3ad91578f5473dcc023f0a7a8cfa0cef8e8ff9 Mon Sep 17 00:00:00 2001 From: Sergio Garcia <47090312+singiamtel@users.noreply.github.com> Date: Fri, 19 Jul 2024 13:18:50 +0200 Subject: [PATCH 6/7] Bump alibuild on old yum repos (#1376) --- .github/workflows/o2-full-deps.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/o2-full-deps.yml b/.github/workflows/o2-full-deps.yml index 1e088dcb..08d2a610 100644 --- a/.github/workflows/o2-full-deps.yml +++ b/.github/workflows/o2-full-deps.yml @@ -27,10 +27,10 @@ jobs: include: - el_version: el7 container: centos:7 - alibuild_tag: v1.17.9 + alibuild_tag: v1.17.10 - el_version: el8 container: almalinux:8 - alibuild_tag: v1.17.9 + alibuild_tag: v1.17.10 - el_version: el9 container: almalinux:9 alibuild_tag: v1.17.7 From 98da90b600aefe70e38d0e8bfb6aa9731bec272a Mon Sep 17 00:00:00 2001 From: Giulio Eulisse <10544+ktf@users.noreply.github.com> Date: Sun, 21 Jul 2024 10:01:25 +0200 Subject: [PATCH 7/7] Wait for PRs on slc9 nodes --- jenkins/daily-tags | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jenkins/daily-tags b/jenkins/daily-tags index bd645043..75d6c130 100644 --- a/jenkins/daily-tags +++ b/jenkins/daily-tags @@ -14,7 +14,7 @@ try { stage "Wait pull requests" if ("$WAIT_PR" == "true") { - node ("slc7_x86-64-light") { + node ("slc9_x86-64-light") { timeout (240) { withEnv(["ALIBOT_SLUG=${ALIBOT_SLUG}", "WAIT_PR_LIMIT=${WAIT_PR_LIMIT}",