Merge branch 'main' into multi-arch

DataWorkflowServices · Mar 19, 2024 · dfaeeb7 · dfaeeb7
2 parents 75041a1 + 1ff8676
commit dfaeeb7
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/testsuite/integration/docker-compose.yml b/testsuite/integration/docker-compose.yml
@@ -1,5 +1,5 @@
 #
-# Copyright 2022 Hewlett Packard Enterprise Development LP
+# Copyright 2022-2024 Hewlett Packard Enterprise Development LP
 # Other additional copyright holders may be indicated within.
 #
 # The entirety of this work is licensed under the Apache License,
@@ -24,8 +24,8 @@ services:
     image: local/integration-test:${TAG:-test}
     build:
       context: .
-      cache_from:
-        - "/tmp/.buildx-cache"
+    #  cache_from:
+    #    - local/integration-test:test
     container_name: integration-test
     privileged: true
     hostname: integration-test
@@ -40,4 +40,4 @@ services:
 networks:
   default:
     name: slurm_default
-    external: true
+    external: true
diff --git a/testsuite/integration/kind/kind.sh b/testsuite/integration/kind/kind.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 #
-# Copyright 2022-2023 Hewlett Packard Enterprise Development LP
+# Copyright 2022-2024 Hewlett Packard Enterprise Development LP
 # Other additional copyright holders may be indicated within.
 #
 # The entirety of this work is licensed under the Apache License,
@@ -71,7 +71,7 @@ install_dependencies () {
 prep_kubeconfig () {
   set -e
   cp ~/.kube/config kubeconfig
-  yq -i e '(.clusters | map(select(.name=="kind-dws")))[0].cluster.server |= "https://dws-control-plane:6443"' kubeconfig
+  KUBECONFIG=kubeconfig kubectl config set-cluster kind-dws --server https://dws-control-plane:6443
   chmod a+r kubeconfig
   KUBECONFIG=kubeconfig kubectl config use-context kind-dws
   KUBECONFIG=kubeconfig kubectl config set-context --current --namespace=slurm

diff --git a/testsuite/integration/requirements.txt b/testsuite/integration/requirements.txt
@@ -1,6 +1,6 @@
 pytest == 7
 pytest-bdd == 6
-pytest-html == 3
-docker == 6
-kubernetes >= 25.3
-tenacity == 8
+pytest-html == 4
+docker == 7
+kubernetes >= 27.2
+tenacity == 8
diff --git a/testsuite/integration/slurm/docker-compose.yml b/testsuite/integration/slurm/docker-compose.yml
@@ -1,5 +1,5 @@
 #
-# Copyright 2022 Hewlett Packard Enterprise Development LP
+# Copyright 2022-2024 Hewlett Packard Enterprise Development LP
 # Other additional copyright holders may be indicated within.
 #
 # The entirety of this work is licensed under the Apache License,
@@ -57,8 +57,8 @@ services:
       context: ../../submodules/slurm-docker-cluster
       args:
         SLURM_TAG: ${SLURM_TAG:-slurm-22-05-4-1}
-      cache_from:
-        - "/tmp/.buildx-cache"
+      #cache_from:
+      #  - slurm-bb:slurm-22-05-4-1
     command: ["slurmctld"]
     container_name: slurmctld
     hostname: slurmctld