fixup! fixup! WIP: store resource artifacts from submodule

.gitlab-ci.yml

@@ -84,7 +84,8 @@ stages:
 
 .linux-amd64: &linux_amd64
   tags:
-    - linux
+    - linux-test
+    - runner-manager
     - amd64
 
 .linux-stress-amd64: &linux_stress_amd64
@@ -230,9 +231,14 @@ stages:
   <<: *base_image
   stage: autoconf
   script:
+    - ls -1 /sys/fs/cgroup
+    - git clone --depth 1 --branch ci_test https://gitlab.isc.org/isc-projects/resource-monitor
+    - ( cd resource-monitor; ./monitor.py --cgroup-base-dir /sys/fs/cgroup/ ) &
     - autoreconf -fi
   artifacts:
     untracked: true
+    paths:
+      - resource-monitor/*.json
 
 .configure: &configure
     - ${CONFIGURE}
@@ -281,6 +287,9 @@ stages:
   <<: *default_triggering_rules
   stage: build
   before_script:
+    - ls -1 /sys/fs/cgroup
+    - git clone --depth 1 --branch ci_test https://gitlab.isc.org/isc-projects/resource-monitor
+    - ( cd resource-monitor; ./monitor.py --cgroup-base-dir /sys/fs/cgroup/ ) &
     - test -w "${CCACHE_DIR}" && export PATH="/usr/lib/ccache:${PATH}"
     - test -n "${OUT_OF_TREE_WORKSPACE}" && mkdir "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
   script:
@@ -303,6 +312,8 @@ stages:
   artifacts:
     untracked: true
     when: always
+    paths:
+      - resource-monitor/*.json
 
 .setup_interfaces: &setup_interfaces
     - if [ "$(id -u)" -eq "0" ]; then
@@ -315,6 +326,9 @@ stages:
   <<: *default_triggering_rules
   stage: system
   before_script:
+    - ls -1 /sys/fs/cgroup
+    - git clone --depth 1 --branch ci_test https://gitlab.isc.org/isc-projects/resource-monitor
+    - ( cd resource-monitor; ./monitor.py --cgroup-base-dir /sys/fs/cgroup/ ) &
     - test -n "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
     - *setup_interfaces
   script:
@@ -339,12 +353,16 @@ stages:
     when: always
     reports:
       junit: junit.xml
+    paths:
+      - resource-monitor/*.json
 
 .system_test_gcov: &system_test_gcov_job
   <<: *system_test_common
   artifacts:
     untracked: true
     when: always
+    paths:
+      - resource-monitor/*.json
 
 .system_test_tsan: &system_test_tsan_job
   <<: *system_test_common
@@ -360,11 +378,16 @@ stages:
     when: always
     reports:
       junit: junit.xml
+    paths:
+      - resource-monitor/*.json
 
 .unit_test_common: &unit_test_common
   <<: *default_triggering_rules
   stage: unit
   before_script:
+    - ls -1 /sys/fs/cgroup
+    - git clone --depth 1 --branch ci_test https://gitlab.isc.org/isc-projects/resource-monitor
+    - ( cd resource-monitor; ./monitor.py --cgroup-base-dir /sys/fs/cgroup/ ) &
     - test -n "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
   script:
     - make -j${TEST_PARALLEL_JOBS:-1} -k unit V=1
@@ -383,12 +406,16 @@ stages:
     when: always
     reports:
       junit: junit.xml
+    paths:
+      - resource-monitor/*.json
 
 .unit_test_gcov: &unit_test_gcov_job
   <<: *unit_test_common
   artifacts:
     untracked: true
     when: always
+    paths:
+      - resource-monitor/*.json
 
 .unit_test_tsan: &unit_test_tsan_job
   <<: *unit_test_common
@@ -402,10 +429,15 @@ stages:
     when: always
     reports:
       junit: junit.xml
+    paths:
+      - resource-monitor/*.json
 
 .docs: &docs_job
   stage: docs
   script:
+    - ls -1 /sys/fs/cgroup
+    - git clone --depth 1 --branch ci_test https://gitlab.isc.org/isc-projects/resource-monitor
+    - ( cd resource-monitor; ./monitor.py --cgroup-base-dir /sys/fs/cgroup/ ) &
     - *configure
     - make -j${BUILD_PARALLEL_JOBS:-1} -k doc V=1
     - qpdf --check doc/arm/_build/latex/Bv9ARM.pdf
@@ -425,6 +457,7 @@ stages:
   artifacts:
     paths:
       - bind-qa/bind9/respdiff
+      - resource-monitor/*.json
     exclude:
       - bind-qa/bind9/respdiff/rspworkdir/data.mdb # Exclude a 10 GB file.
     untracked: true
@@ -533,6 +566,9 @@ tarball-create:
   <<: *base_image
   <<: *default_triggering_rules
   script:
+    - ls -1 /sys/fs/cgroup
+    - git clone --depth 1 --branch ci_test https://gitlab.isc.org/isc-projects/resource-monitor
+    - ( cd resource-monitor; ./monitor.py --cgroup-base-dir /sys/fs/cgroup/ ) &
     - ./configure --enable-maintainer-mode
     - make maintainer-clean
     - autoreconf -fi
@@ -544,6 +580,7 @@ tarball-create:
     paths:
       - diff.patch
       - bind-*.tar.${TARBALL_EXTENSION}
+      - resource-monitor/*.json
     when: always
   needs:
     - job: autoreconf
@@ -560,6 +597,8 @@ docs:
       artifacts: true
   artifacts:
     untracked: true
+    paths:
+      - resource-monitor/*.json
 
 docs:tarball:
   <<: *default_triggering_rules
@@ -770,6 +809,9 @@ scan-build:
     CONFIGURE: "${SCAN_BUILD} ./configure"
     EXTRA_CONFIGURE: "--with-libidn2"
   script:
+    - ls -1 /sys/fs/cgroup
+    - git clone --depth 1 --branch ci_test https://gitlab.isc.org/isc-projects/resource-monitor
+    - ( cd resource-monitor; ./monitor.py --cgroup-base-dir /sys/fs/cgroup/ ) &
     - *configure
     - *scan_build
   needs:
@@ -777,6 +819,7 @@ scan-build:
       artifacts: true
   artifacts:
     paths:
+      - resource-monitor/*.json
       - scan-build.reports/
     when: on_failure
 
@@ -1318,6 +1361,9 @@ respdiff-short:asan:
     EXTRA_CONFIGURE: "--without-jemalloc"
     MAX_DISAGREEMENTS_PERCENTAGE: "0.5"
   script:
+    - ls -1 /sys/fs/cgroup
+    - git clone --depth 1 --branch ci_test https://gitlab.isc.org/isc-projects/resource-monitor
+    - ( cd resource-monitor; ./monitor.py --cgroup-base-dir /sys/fs/cgroup/ ) &
     - bash respdiff.sh -s named -q "${PWD}/10k_a.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "/usr/local/respdiff-reference-bind/sbin/named"
 
 respdiff-short:tsan:
@@ -1331,6 +1377,9 @@ respdiff-short:tsan:
     MAX_DISAGREEMENTS_PERCENTAGE: "0.5"
     TSAN_OPTIONS: "${TSAN_OPTIONS_DEFAULT}"
   script:
+    - ls -1 /sys/fs/cgroup
+    - git clone --depth 1 --branch ci_test https://gitlab.isc.org/isc-projects/resource-monitor
+    - ( cd resource-monitor; ./monitor.py --cgroup-base-dir /sys/fs/cgroup/ ) &
     - bash respdiff.sh -s named -q "${PWD}/10k_a.txt" -c 3 -w "${PWD}/rspworkdir" "${CI_PROJECT_DIR}" "/usr/local/respdiff-reference-bind/sbin/named"
   after_script:
     - *find_python
@@ -1568,6 +1617,9 @@ gcov:
     - job: system:gcc:bullseye:amd64
       artifacts: true
   script:
+    - ls -1 /sys/fs/cgroup
+    - git clone --depth 1 --branch ci_test https://gitlab.isc.org/isc-projects/resource-monitor
+    - ( cd resource-monitor; ./monitor.py --cgroup-base-dir /sys/fs/cgroup/ ) &
     # *.gcno and *.gcda files generated for shared library objects are created
     # in directories in which gcovr is unable to process them properly
     # (.../.libs/...).  Move such *.gcno and *.gcda files one level higher.
@@ -1594,6 +1646,7 @@ gcov:
   coverage: /^TOTAL.*\s+(\d+\%)$/
   artifacts:
     paths:
+      - resource-monitor/*.json
       - coverage*.html
       - coverage.txt
       - coverage.xml
@@ -1611,9 +1664,13 @@ pairwise:
     - job: autoreconf
       artifacts: true
   script:
-      - util/pairwise-testing.sh
+    - ls -1 /sys/fs/cgroup
+    - git clone --depth 1 --branch ci_test https://gitlab.isc.org/isc-projects/resource-monitor
+    - ( cd resource-monitor; ./monitor.py --cgroup-base-dir /sys/fs/cgroup/ ) &
+    - util/pairwise-testing.sh
   artifacts:
     paths:
+      - resource-monitor/*.json
       - pairwise-commands.txt
       - pairwise-model.txt
       - pairwise-output.*.txt