!fixup remote this

spack · Jun 29, 2023 · f6e3cfb · f6e3cfb
1 parent 68d5f4b
commit f6e3cfb
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 50 deletions.
diff --git a/lib/spack/spack/installer.py b/lib/spack/spack/installer.py
@@ -87,7 +87,7 @@
 
 
 def _write_timer_json(pkg, timer, cache):
-    extra_attributes = {"name": pkg.name, "cache": cache}
+    extra_attributes = {"name": pkg.name, "hash": pkg.spec.dag_hash(), "cache": cache}
     try:
         with open(pkg.times_log_path, "w") as timelog:
             timer.write_json(timelog, depth=-1, extra_attributes=extra_attributes)

diff --git a/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml b/share/spack/gitlab/cloud_pipelines/.gitlab-ci.yml
@@ -304,11 +304,11 @@ e4s-build:
   variables:
     SPACK_CI_STACK_NAME: gpu-tests
 
-gpu-tests-generate:
+.gpu-tests-generate:
   extends: [ ".gpu-tests", ".generate"]
   image: ecpe4s/ubuntu20.04-runner-x86_64:2023-01-01
 
-gpu-tests-build:
+.gpu-tests-build:
   extends: [ ".gpu-tests", ".build" ]
   trigger:
     include:
@@ -327,11 +327,11 @@ gpu-tests-build:
   variables:
     SPACK_CI_STACK_NAME: e4s-oneapi
 
-e4s-oneapi-generate:
+.e4s-oneapi-generate:
   extends: [ ".e4s-oneapi", ".generate"]
   image: ecpe4s/ubuntu20.04-runner-x86_64-oneapi:2023.06.01
 
-e4s-oneapi-build:
+.e4s-oneapi-build:
   extends: [ ".e4s-oneapi", ".build" ]
   trigger:
     include:
@@ -354,10 +354,10 @@ e4s-oneapi-build:
   variables:
     SPACK_CI_STACK_NAME: e4s-power
 
-e4s-power-generate:
+.e4s-power-generate:
   extends: [ ".e4s-power", ".generate", ".e4s-power-generate-tags-and-image"]
 
-e4s-power-build:
+.e4s-power-build:
   extends: [ ".e4s-power", ".build" ]
   trigger:
     include:
@@ -376,10 +376,10 @@ e4s-power-build:
   variables:
     SPACK_CI_STACK_NAME: build_systems
 
-build_systems-generate:
+.build_systems-generate:
   extends: [ ".build_systems", ".generate"]
 
-build_systems-build:
+.build_systems-build:
   extends: [ ".build_systems", ".build" ]
   trigger:
     include:
@@ -398,10 +398,10 @@ build_systems-build:
   variables:
     SPACK_CI_STACK_NAME: radiuss
 
-radiuss-generate:
+.radiuss-generate:
   extends: [ ".radiuss", ".generate" ]
 
-radiuss-build:
+.radiuss-build:
   extends: [ ".radiuss", ".build" ]
   trigger:
     include:
@@ -430,10 +430,10 @@ radiuss-build:
   variables:
     SPACK_CI_STACK_NAME: radiuss-aws
 
-radiuss-aws-generate:
+.radiuss-aws-generate:
   extends: [ ".radiuss-aws", ".generate", ".radiuss-aws-overrides", ".tags-x86_64_v4" ]
 
-radiuss-aws-build:
+.radiuss-aws-build:
   extends: [ ".radiuss-aws", ".build" ]
   trigger:
     include:
@@ -452,10 +452,10 @@ radiuss-aws-build:
   variables:
     SPACK_CI_STACK_NAME: radiuss-aws-aarch64
 
-radiuss-aws-aarch64-generate:
+.radiuss-aws-aarch64-generate:
   extends: [ ".radiuss-aws-aarch64", ".generate-aarch64", ".radiuss-aws-overrides" ]
 
-radiuss-aws-aarch64-build:
+.radiuss-aws-aarch64-build:
   extends: [ ".radiuss-aws-aarch64", ".build" ]
   trigger:
     include:
@@ -474,11 +474,11 @@ radiuss-aws-aarch64-build:
   variables:
     SPACK_CI_STACK_NAME: data-vis-sdk
 
-data-vis-sdk-generate:
+.data-vis-sdk-generate:
   extends: [ ".data-vis-sdk", ".generate"]
   image: ecpe4s/ubuntu20.04-runner-x86_64:2023-01-01
 
-data-vis-sdk-build:
+.data-vis-sdk-build:
   extends: [ ".data-vis-sdk", ".build" ]
   trigger:
     include:
@@ -504,10 +504,10 @@ data-vis-sdk-build:
   variables:
     SPACK_CI_STACK_NAME: aws-ahug
 
-aws-ahug-generate:
+.aws-ahug-generate:
   extends: [ ".aws-ahug", ".generate", ".aws-ahug-overrides", ".tags-x86_64_v4" ]
 
-aws-ahug-build:
+.aws-ahug-build:
   extends: [ ".aws-ahug", ".build" ]
   trigger:
     include:
@@ -524,10 +524,10 @@ aws-ahug-build:
   variables:
     SPACK_CI_STACK_NAME: aws-ahug-aarch64
 
-aws-ahug-aarch64-generate:
+.aws-ahug-aarch64-generate:
   extends: [ ".aws-ahug-aarch64", ".generate-aarch64", ".aws-ahug-overrides" ]
 
-aws-ahug-aarch64-build:
+.aws-ahug-aarch64-build:
   extends: [ ".aws-ahug-aarch64", ".build" ]
   trigger:
     include:
@@ -553,10 +553,10 @@ aws-ahug-aarch64-build:
   variables:
     SPACK_CI_STACK_NAME: aws-isc
 
-aws-isc-generate:
+.aws-isc-generate:
   extends: [ ".aws-isc", ".generate", ".aws-isc-overrides", ".tags-x86_64_v4" ]
 
-aws-isc-build:
+.aws-isc-build:
   extends: [ ".aws-isc", ".build" ]
   trigger:
     include:
@@ -574,10 +574,10 @@ aws-isc-build:
   variables:
     SPACK_CI_STACK_NAME: aws-isc-aarch64
 
-aws-isc-aarch64-generate:
+.aws-isc-aarch64-generate:
   extends: [ ".aws-isc-aarch64", ".generate-aarch64", ".aws-isc-overrides" ]
 
-aws-isc-aarch64-build:
+.aws-isc-aarch64-build:
   extends: [ ".aws-isc-aarch64", ".build" ]
   trigger:
     include:
@@ -597,11 +597,11 @@ aws-isc-aarch64-build:
   variables:
     SPACK_CI_STACK_NAME: tutorial
 
-tutorial-generate:
+.tutorial-generate:
   extends: [ ".tutorial", ".generate"]
   image: ghcr.io/spack/tutorial-ubuntu-22.04:v2023-05-07
 
-tutorial-build:
+.tutorial-build:
   extends: [ ".tutorial", ".build" ]
   trigger:
     include:
@@ -620,11 +620,11 @@ tutorial-build:
   variables:
     SPACK_CI_STACK_NAME: ml-linux-x86_64-cpu
 
-ml-linux-x86_64-cpu-generate:
+.ml-linux-x86_64-cpu-generate:
   extends: [ ".generate", .ml-linux-x86_64-cpu, ".tags-x86_64_v4" ]
   image: ghcr.io/spack/linux-ubuntu22.04-x86_64_v2:nightly
 
-ml-linux-x86_64-cpu-build:
+.ml-linux-x86_64-cpu-build:
   extends: [ ".build", ".ml-linux-x86_64-cpu" ]
   trigger:
     include:
@@ -643,11 +643,11 @@ ml-linux-x86_64-cpu-build:
   variables:
     SPACK_CI_STACK_NAME: ml-linux-x86_64-cuda
 
-ml-linux-x86_64-cuda-generate:
+.ml-linux-x86_64-cuda-generate:
   extends: [ ".generate", .ml-linux-x86_64-cuda, ".tags-x86_64_v4" ]
   image: ghcr.io/spack/linux-ubuntu22.04-x86_64_v2:nightly
 
-ml-linux-x86_64-cuda-build:
+.ml-linux-x86_64-cuda-build:
   extends: [ ".build", ".ml-linux-x86_64-cuda"  ]
   trigger:
     include:
@@ -666,11 +666,11 @@ ml-linux-x86_64-cuda-build:
   variables:
     SPACK_CI_STACK_NAME: ml-linux-x86_64-rocm
 
-ml-linux-x86_64-rocm-generate:
+.ml-linux-x86_64-rocm-generate:
   extends: [ ".generate", .ml-linux-x86_64-rocm, ".tags-x86_64_v4" ]
   image: ghcr.io/spack/linux-ubuntu22.04-x86_64_v2:nightly
 
-ml-linux-x86_64-rocm-build:
+.ml-linux-x86_64-rocm-build:
   extends: [ ".build", ".ml-linux-x86_64-rocm" ]
   trigger:
     include:
@@ -688,11 +688,11 @@ ml-linux-x86_64-rocm-build:
   variables:
     SPACK_CI_STACK_NAME: ml-darwin-aarch64-mps
 
-ml-darwin-aarch64-mps-generate:
+.ml-darwin-aarch64-mps-generate:
   tags: [ "macos-ventura", "apple-clang-14", "aarch64-macos" ]
   extends: [ ".ml-darwin-aarch64-mps", ".darwin-generate"]
 
-ml-darwin-aarch64-mps-build:
+.ml-darwin-aarch64-mps-build:
   extends: [ ".ml-darwin-aarch64-mps", ".build" ]
   trigger:
     include:
@@ -710,10 +710,10 @@ ml-darwin-aarch64-mps-build:
   variables:
     SPACK_CI_STACK_NAME: deprecated
 
-deprecated-ci-generate:
+.deprecated-ci-generate:
   extends: [ ".generate-deprecated", ".deprecated-ci" ]
 
-deprecated-ci-build:
+.deprecated-ci-build:
   extends: [ ".build", ".deprecated-ci" ]
   trigger:
     include:
@@ -753,10 +753,10 @@ deprecated-ci-build:
   variables:
     SPACK_CI_STACK_NAME: aws-pcluster-icelake
 
-aws-pcluster-generate-icelake:
+.aws-pcluster-generate-icelake:
   extends: [ ".linux_icelake", ".aws-pcluster-icelake", ".generate", ".tags-x86_64_v4", ".aws-pcluster-generate", ".aws-pcluster-generate-image" ]
 
-aws-pcluster-build-icelake:
+.aws-pcluster-build-icelake:
   extends: [ ".linux_icelake", ".aws-pcluster-icelake", ".build" ]
   trigger:
     include:
@@ -772,10 +772,10 @@ aws-pcluster-build-icelake:
   variables:
     SPACK_CI_STACK_NAME: aws-pcluster-skylake
 
-aws-pcluster-generate-skylake:
+.aws-pcluster-generate-skylake:
   extends: [ ".linux_skylake", ".aws-pcluster-skylake", ".generate", ".tags-x86_64_v4", ".aws-pcluster-generate", ".aws-pcluster-generate-image" ]
 
-aws-pcluster-build-skylake:
+.aws-pcluster-build-skylake:
   extends: [ ".linux_skylake", ".aws-pcluster-skylake", ".build" ]
   trigger:
     include:
@@ -791,10 +791,10 @@ aws-pcluster-build-skylake:
   variables:
     SPACK_CI_STACK_NAME: aws-pcluster-neoverse_n1
 
-aws-pcluster-generate-neoverse_n1:
+.aws-pcluster-generate-neoverse_n1:
   extends: [ ".linux_neoverse_n1", ".aws-pcluster-neoverse_n1", ".generate-aarch64", ".aws-pcluster-generate", ".aws-pcluster-generate-image" ]
 
-aws-pcluster-build-neoverse_n1:
+.aws-pcluster-build-neoverse_n1:
   extends: [  ".linux_neoverse_n1", ".aws-pcluster-neoverse_n1", ".build" ]
   trigger:
     include:
@@ -810,10 +810,10 @@ aws-pcluster-build-neoverse_n1:
   variables:
     SPACK_CI_STACK_NAME: aws-pcluster-neoverse_v1
 
-aws-pcluster-generate-neoverse_v1:
+.aws-pcluster-generate-neoverse_v1:
   extends: [ ".linux_neoverse_v1", ".aws-pcluster-neoverse_v1", ".generate-aarch64", ".aws-pcluster-generate", ".aws-pcluster-generate-image" ]
 
-aws-pcluster-build-neoverse_v1:
+.aws-pcluster-build-neoverse_v1:
   extends: [  ".linux_neoverse_v1", ".aws-pcluster-neoverse_v1", ".build" ]
   trigger:
     include:
@@ -896,10 +896,10 @@ aws-pcluster-build-neoverse_v1:
   variables:
     SPACK_CI_STACK_NAME: e4s-cray
 
-e4s-cray-generate:
+.e4s-cray-generate:
   extends: [ ".generate-cray", ".e4s-cray" ]
 
-e4s-cray-build:
+.e4s-cray-build:
   extends: [ ".build-cray", ".e4s-cray" ]
   trigger:
     include:
@@ -908,4 +908,4 @@ e4s-cray-build:
     strategy: depend
   needs:
     - artifacts: True
-      job: e4s-cray-generate
+      job: e4s-cray-generate
diff --git a/share/spack/gitlab/cloud_pipelines/configs/ci.yaml b/share/spack/gitlab/cloud_pipelines/configs/ci.yaml
@@ -21,11 +21,11 @@ ci:
         - if [[ -r /mnt/key/intermediate_ci_signing_key.gpg ]]; then spack gpg trust /mnt/key/intermediate_ci_signing_key.gpg; fi
         - if [[ -r /mnt/key/spack_public_key.gpg ]]; then spack gpg trust /mnt/key/spack_public_key.gpg; fi
         - spack --color=always --backtrace ci rebuild --tests > >(tee ${SPACK_ARTIFACTS_ROOT}/user_data/pipeline_out.txt) 2> >(tee ${SPACK_ARTIFACTS_ROOT}/user_data/pipeline_err.txt >&2)
-      after_script:
       - - spack python ${CI_PROJECT_DIR}/share/spack/gitlab/cloud_pipelines/scripts/common/aggregate_package_logs.spack.py
           --config ${SPACK_CONCRETE_ENV_DIR}/spack.yaml
           --log install_times.json
-          ${SPACK_ARTIFACTS_ROOT}/install_times.json
+          ${SPACK_ARTIFACTS_ROOT}/user_data/install_times.json
+      after_script:
       - - cat /proc/loadavg || true
       variables:
         CI_JOB_SIZE: "default"

diff --git a/var/spack/repos/builtin/packages/py-h5py/package.py b/var/spack/repos/builtin/packages/py-h5py/package.py
@@ -36,6 +36,7 @@ class PyH5py(PythonPackage):
     version("2.4.0", sha256="faaeadf4b8ca14c054b7568842e0d12690de7d5d68af4ecce5d7b8fc104d8e60")
 
     variant("mpi", default=True, description="Build with MPI support")
+    variant("dummy2", default=True, description="Change the hash")
 
     # Python versions
     depends_on("python@:3.9", type=("build", "run"), when="@:2.8")