From fd1512961569d56fec7ef2571215600daad1aec2 Mon Sep 17 00:00:00 2001 From: Mahendra Paipuri Date: Sat, 6 Jan 2024 19:22:40 +0100 Subject: [PATCH] test: Update test outputs with procfs fixture Signed-off-by: Mahendra Paipuri --- .../fixtures/output/e2e-test-cgroupsv2-all-metrics-output.txt | 4 ++-- .../fixtures/output/e2e-test-cgroupsv2-amd-output.txt | 2 +- .../fixtures/output/e2e-test-cgroupsv2-nogpu-output.txt | 2 +- .../fixtures/output/e2e-test-cgroupsv2-nvidia-output.txt | 2 +- scripts/e2e-test.sh | 4 ++++ 5 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkg/collector/fixtures/output/e2e-test-cgroupsv2-all-metrics-output.txt b/pkg/collector/fixtures/output/e2e-test-cgroupsv2-all-metrics-output.txt index 8c817e7a..1f954c73 100644 --- a/pkg/collector/fixtures/output/e2e-test-cgroupsv2-all-metrics-output.txt +++ b/pkg/collector/fixtures/output/e2e-test-cgroupsv2-all-metrics-output.txt @@ -62,13 +62,13 @@ batchjob_slurm_job_memory_used_bytes{batch="slurm",hostname="",jobaccount="testa batchjob_slurm_job_memsw_fail_count{batch="slurm",hostname="",jobaccount="testacc",jobid="1009248",jobuser="testusr",jobuuid="0f0ac288-dbd4-a9a3-df3a-ab14ef9d51d5",step="",task=""} 0 # HELP batchjob_slurm_job_memsw_total_bytes Swap total in bytes # TYPE batchjob_slurm_job_memsw_total_bytes gauge -batchjob_slurm_job_memsw_total_bytes{batch="slurm",hostname="",jobaccount="testacc",jobid="1009248",jobuser="testusr",jobuuid="0f0ac288-dbd4-a9a3-df3a-ab14ef9d51d5",step="",task=""} 1.6378171392e+10 +batchjob_slurm_job_memsw_total_bytes{batch="slurm",hostname="",jobaccount="testacc",jobid="1009248",jobuser="testusr",jobuuid="0f0ac288-dbd4-a9a3-df3a-ab14ef9d51d5",step="",task=""} 1.6042172416e+10 # HELP batchjob_slurm_job_memsw_used_bytes Swap used in bytes # TYPE batchjob_slurm_job_memsw_used_bytes gauge batchjob_slurm_job_memsw_used_bytes{batch="slurm",hostname="",jobaccount="testacc",jobid="1009248",jobuser="testusr",jobuuid="0f0ac288-dbd4-a9a3-df3a-ab14ef9d51d5",step="",task=""} 0 # HELP batchjob_slurm_job_system_memory_total_bytes Available total system memory in bytes # TYPE batchjob_slurm_job_system_memory_total_bytes gauge -batchjob_slurm_job_system_memory_total_bytes{batch="slurm",hostname=""} 1.6378171392e+10 +batchjob_slurm_job_system_memory_total_bytes{batch="slurm",hostname=""} 1.6042172416e+10 # HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles. # TYPE go_gc_duration_seconds summary # HELP go_goroutines Number of goroutines that currently exist. diff --git a/pkg/collector/fixtures/output/e2e-test-cgroupsv2-amd-output.txt b/pkg/collector/fixtures/output/e2e-test-cgroupsv2-amd-output.txt index 9d182bd6..ce0ae71f 100644 --- a/pkg/collector/fixtures/output/e2e-test-cgroupsv2-amd-output.txt +++ b/pkg/collector/fixtures/output/e2e-test-cgroupsv2-amd-output.txt @@ -53,7 +53,7 @@ batchjob_slurm_job_memory_total_bytes{batch="slurm",hostname="",jobaccount="test batchjob_slurm_job_memory_used_bytes{batch="slurm",hostname="",jobaccount="testacc",jobid="1009248",jobuser="testusr",jobuuid="0f0ac288-dbd4-a9a3-df3a-ab14ef9d51d5",step="",task=""} 4.111491072e+09 # HELP batchjob_slurm_job_system_memory_total_bytes Available total system memory in bytes # TYPE batchjob_slurm_job_system_memory_total_bytes gauge -batchjob_slurm_job_system_memory_total_bytes{batch="slurm",hostname=""} 1.6378171392e+10 +batchjob_slurm_job_system_memory_total_bytes{batch="slurm",hostname=""} 1.6042172416e+10 # HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles. # TYPE go_gc_duration_seconds summary # HELP go_goroutines Number of goroutines that currently exist. diff --git a/pkg/collector/fixtures/output/e2e-test-cgroupsv2-nogpu-output.txt b/pkg/collector/fixtures/output/e2e-test-cgroupsv2-nogpu-output.txt index 2ff48116..fac454e0 100644 --- a/pkg/collector/fixtures/output/e2e-test-cgroupsv2-nogpu-output.txt +++ b/pkg/collector/fixtures/output/e2e-test-cgroupsv2-nogpu-output.txt @@ -49,7 +49,7 @@ batchjob_slurm_job_memory_total_bytes{batch="slurm",hostname="",jobaccount="test batchjob_slurm_job_memory_used_bytes{batch="slurm",hostname="",jobaccount="testacc",jobid="1009248",jobuser="testusr",jobuuid="0f0ac288-dbd4-a9a3-df3a-ab14ef9d51d5",step="",task=""} 4.111491072e+09 # HELP batchjob_slurm_job_system_memory_total_bytes Available total system memory in bytes # TYPE batchjob_slurm_job_system_memory_total_bytes gauge -batchjob_slurm_job_system_memory_total_bytes{batch="slurm",hostname=""} 1.6378171392e+10 +batchjob_slurm_job_system_memory_total_bytes{batch="slurm",hostname=""} 1.6042172416e+10 # HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles. # TYPE go_gc_duration_seconds summary # HELP go_goroutines Number of goroutines that currently exist. diff --git a/pkg/collector/fixtures/output/e2e-test-cgroupsv2-nvidia-output.txt b/pkg/collector/fixtures/output/e2e-test-cgroupsv2-nvidia-output.txt index a8121d04..0acd8ce9 100644 --- a/pkg/collector/fixtures/output/e2e-test-cgroupsv2-nvidia-output.txt +++ b/pkg/collector/fixtures/output/e2e-test-cgroupsv2-nvidia-output.txt @@ -53,7 +53,7 @@ batchjob_slurm_job_memory_total_bytes{batch="slurm",hostname="",jobaccount="test batchjob_slurm_job_memory_used_bytes{batch="slurm",hostname="",jobaccount="testacc",jobid="1009248",jobuser="testusr",jobuuid="0f0ac288-dbd4-a9a3-df3a-ab14ef9d51d5",step="",task=""} 4.111491072e+09 # HELP batchjob_slurm_job_system_memory_total_bytes Available total system memory in bytes # TYPE batchjob_slurm_job_system_memory_total_bytes gauge -batchjob_slurm_job_system_memory_total_bytes{batch="slurm",hostname=""} 1.6378171392e+10 +batchjob_slurm_job_system_memory_total_bytes{batch="slurm",hostname=""} 1.6042172416e+10 # HELP go_gc_duration_seconds A summary of the pause duration of garbage collection cycles. # TYPE go_gc_duration_seconds summary # HELP go_goroutines Number of goroutines that currently exist. diff --git a/scripts/e2e-test.sh b/scripts/e2e-test.sh index f3c88bf1..c1ca85dd 100755 --- a/scripts/e2e-test.sh +++ b/scripts/e2e-test.sh @@ -195,6 +195,7 @@ then ./bin/batchjob_exporter \ --path.sysfs="pkg/collector/fixtures/sys" \ --path.cgroupfs="pkg/collector/fixtures/sys/fs/cgroup" \ + --path.procfs="pkg/collector/fixtures/proc" \ --collector.slurm.create.unique.jobids \ --collector.slurm.job.props.path="pkg/collector/fixtures/slurmjobprops" \ --collector.slurm.gpu.type="nvidia" \ @@ -211,6 +212,7 @@ then ./bin/batchjob_exporter \ --path.sysfs="pkg/collector/fixtures/sys" \ --path.cgroupfs="pkg/collector/fixtures/sys/fs/cgroup" \ + --path.procfs="pkg/collector/fixtures/proc" \ --collector.slurm.create.unique.jobids \ --collector.slurm.job.props.path="pkg/collector/fixtures/slurmjobprops" \ --collector.slurm.gpu.type="amd" \ @@ -227,6 +229,7 @@ then ./bin/batchjob_exporter \ --path.sysfs="pkg/collector/fixtures/sys" \ --path.cgroupfs="pkg/collector/fixtures/sys/fs/cgroup" \ + --path.procfs="pkg/collector/fixtures/proc" \ --collector.slurm.create.unique.jobids \ --collector.slurm.job.props.path="pkg/collector/fixtures/slurmjobprops" \ --collector.slurm.force.cgroups.version="v2" \ @@ -255,6 +258,7 @@ then ./bin/batchjob_exporter \ --path.sysfs="pkg/collector/fixtures/sys" \ --path.cgroupfs="pkg/collector/fixtures/sys/fs/cgroup" \ + --path.procfs="pkg/collector/fixtures/proc" \ --collector.slurm.create.unique.jobids \ --collector.slurm.job.props.path="pkg/collector/fixtures/slurmjobprops" \ --collector.slurm.gpu.type="amd" \