From 1c514b95ef6627c4acf36dab1ac8d4a9d7a5f561 Mon Sep 17 00:00:00 2001 From: Artur Harasimiuk Date: Mon, 11 Dec 2023 17:23:11 +0000 Subject: [PATCH] ci: copy build logs when requested Related-To: NEO-9328 Signed-off-by: Artur Harasimiuk --- manifests/manifest.yml | 2 +- .../packaging/l0_gpu_driver/rhel_8/SPECS/l0_gpu_driver.spec | 4 ++++ .../packaging/l0_gpu_driver/sles_15/SPECS/l0_gpu_driver.spec | 4 ++++ scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules | 1 + scripts/packaging/opencl/rhel_8/SPECS/opencl.spec | 4 ++++ scripts/packaging/opencl/sles_15/SPECS/opencl.spec | 4 ++++ scripts/packaging/opencl/ubuntu_20.04/debian/rules | 1 + 7 files changed, 19 insertions(+), 1 deletion(-) diff --git a/manifests/manifest.yml b/manifests/manifest.yml index ddfb96f900985..31d4d336f34cd 100644 --- a/manifests/manifest.yml +++ b/manifests/manifest.yml @@ -31,7 +31,7 @@ components: branch: master dest_dir: infra fetch_tags: true - revision: v5578 + revision: v5589 type: git internal: branch: master diff --git a/scripts/packaging/l0_gpu_driver/rhel_8/SPECS/l0_gpu_driver.spec b/scripts/packaging/l0_gpu_driver/rhel_8/SPECS/l0_gpu_driver.spec index 7531acf1dd71c..a4e7daf7fc0a3 100644 --- a/scripts/packaging/l0_gpu_driver/rhel_8/SPECS/l0_gpu_driver.spec +++ b/scripts/packaging/l0_gpu_driver/rhel_8/SPECS/l0_gpu_driver.spec @@ -92,6 +92,10 @@ rm -rvf %{buildroot}/usr/lib/debug/ mkdir -p %{buildroot}/usr/share/doc/intel-level-zero-gpu/ cp -pvR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-level-zero-gpu/. +if [ -d "${NEO_NINJA_DUMP}" ]; then + cp -v .ninja* ${NEO_NINJA_DUMP}/ +fi + %files %defattr(-,root,root) %{_libdir}/libze_intel_gpu.so.* diff --git a/scripts/packaging/l0_gpu_driver/sles_15/SPECS/l0_gpu_driver.spec b/scripts/packaging/l0_gpu_driver/sles_15/SPECS/l0_gpu_driver.spec index eab544e21ca1f..5cc3b00e1ed88 100644 --- a/scripts/packaging/l0_gpu_driver/sles_15/SPECS/l0_gpu_driver.spec +++ b/scripts/packaging/l0_gpu_driver/sles_15/SPECS/l0_gpu_driver.spec @@ -102,6 +102,10 @@ rm -rvf %{buildroot}/usr/lib/debug/ mkdir -p %{buildroot}/usr/share/doc/intel-level-zero-gpu%{?name_suffix}/ cp -pvR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-level-zero-gpu%{?name_suffix}/. +if [ -d "${NEO_NINJA_DUMP}" ]; then + cp -v .ninja* ${NEO_NINJA_DUMP}/ +fi + %files -n intel-level-zero-gpu%{?name_suffix} %defattr(-,root,root) %{_libdir}/libze_intel_gpu.so.* diff --git a/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules b/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules index 6f4249f2d6bb0..7325b621d9941 100755 --- a/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules +++ b/scripts/packaging/l0_gpu_driver/ubuntu_20.04/debian/rules @@ -39,6 +39,7 @@ override_dh_install: rm -rf debian/intel-level-zero-gpu/usr/lib/${DEB_TARGET_MULTIARCH}/libocloc.so rm -rvf debian/intel-level-zero-gpu/usr/lib/debug dh_install + if [ -d "${NEO_NINJA_DUMP}" ]; then find -name .ninja_\* -type f -exec cp -v {} ${NEO_NINJA_DUMP}/ \;; fi override_dh_builddeb: dh_builddeb -- -Zxz diff --git a/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec b/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec index f212796c29291..cffdf1e875ead 100644 --- a/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec +++ b/scripts/packaging/opencl/rhel_8/SPECS/opencl.spec @@ -84,6 +84,10 @@ cp -pvR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-opencl/. mkdir -p %{buildroot}/usr/share/doc/intel-ocloc/ cp -pvR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-ocloc/. +if [ -d "${NEO_NINJA_DUMP}" ]; then + cp -v .ninja* ${NEO_NINJA_DUMP}/ +fi + %files %defattr(-,root,root) %{_libdir}/intel-opencl/libigdrcl.so diff --git a/scripts/packaging/opencl/sles_15/SPECS/opencl.spec b/scripts/packaging/opencl/sles_15/SPECS/opencl.spec index 98d5cf06f505b..2b770f79abf70 100644 --- a/scripts/packaging/opencl/sles_15/SPECS/opencl.spec +++ b/scripts/packaging/opencl/sles_15/SPECS/opencl.spec @@ -92,6 +92,10 @@ cp -pvR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-opencl%{?name_s mkdir -p %{buildroot}/usr/share/doc/intel-ocloc%{?name_suffix}/ cp -pvR %{_sourcedir}/copyright %{buildroot}/usr/share/doc/intel-ocloc%{?name_suffix}/. +if [ -d "${NEO_NINJA_DUMP}" ]; then + cp -v .ninja* ${NEO_NINJA_DUMP}/ +fi + %files -n intel-opencl%{?name_suffix} %defattr(-,root,root) %{_sysconfdir}/OpenCL diff --git a/scripts/packaging/opencl/ubuntu_20.04/debian/rules b/scripts/packaging/opencl/ubuntu_20.04/debian/rules index 6a254bfd4121b..b34ec5bfcd8cc 100755 --- a/scripts/packaging/opencl/ubuntu_20.04/debian/rules +++ b/scripts/packaging/opencl/ubuntu_20.04/debian/rules @@ -34,6 +34,7 @@ override_dh_auto_build: override_dh_install: rm -rvf debian/intel-opencl-icd/usr/lib/debug dh_install + if [ -d "${NEO_NINJA_DUMP}" ]; then find -name .ninja_\* -type f -exec cp -v {} ${NEO_NINJA_DUMP}/ \;; fi override_dh_builddeb: dh_builddeb -- -Zxz