diff --git a/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml b/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml index f53679e..8908e57 100644 --- a/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml +++ b/test-kuttl/e2e/cluster-follow/00-create-cluster.yaml @@ -10,10 +10,10 @@ spec: replicas: 1 networking: circuitRelays: 1 - ipfsResources: - limits: - cpu: 250m - memory: 512M + # ipfsResources: + # limits: + # cpu: 250m + # memory: 512M follows: - name: gutenberg_es - template: gutenberg-es.collab.ipfscluster.io \ No newline at end of file + template: gutenberg-es.collab.ipfscluster.io diff --git a/test-kuttl/e2e/cluster-follow/05-assert-running.yaml b/test-kuttl/e2e/cluster-follow/05-assert-running.yaml index ce53519..5ae99dd 100644 --- a/test-kuttl/e2e/cluster-follow/05-assert-running.yaml +++ b/test-kuttl/e2e/cluster-follow/05-assert-running.yaml @@ -1,6 +1,11 @@ --- apiVersion: kuttl.dev/v1beta1 kind: TestAssert +collectors: + - type: command + command: kubectl -n "$NAMESPACE" describe all,ipfscluster + - type: command + command: kubectl -n ipfs-operator-system logs deployment/ipfs-operator-controller-manager --- apiVersion: apps/v1 kind: StatefulSet diff --git a/test-kuttl/e2e/cluster-follow/10-validate-contents.sh b/test-kuttl/e2e/cluster-follow/10-validate-contents.sh index a2603c7..a53f323 100755 --- a/test-kuttl/e2e/cluster-follow/10-validate-contents.sh +++ b/test-kuttl/e2e/cluster-follow/10-validate-contents.sh @@ -22,7 +22,7 @@ count_pins() { declare pinTypeRecursive="recursive" # ensure that the corresponding IPFS container has pinned content - pins=$(kubectl exec "${podName}" -n "${NAMESPACE}" -c "${followContainerName}" -- ipfs pin ls | grep -i "${pinTypeRecursive}") + pins=$(kubectl exec "${podName}" -n "${NAMESPACE}" -c "${followContainerName}" -- ipfs-cluster-ctl pin ls | grep -i "${pinTypeRecursive}") readarray -d $'\n' -t pinArray <<< "${pins}" echo "${#pinArray[*]}" } @@ -53,4 +53,4 @@ main() { done } -main \ No newline at end of file +main diff --git a/test-kuttl/e2e/ipfs/10-assert.yaml b/test-kuttl/e2e/ipfs/10-assert.yaml index aae6ae3..008028f 100644 --- a/test-kuttl/e2e/ipfs/10-assert.yaml +++ b/test-kuttl/e2e/ipfs/10-assert.yaml @@ -1,6 +1,11 @@ --- apiVersion: kuttl.dev/v1beta1 kind: TestAssert +collectors: + - type: command + command: kubectl -n "$NAMESPACE" describe all,ipfscluster + - type: command + command: kubectl -n ipfs-operator-system logs deployment/ipfs-operator-controller-manager --- apiVersion: apps/v1 kind: StatefulSet diff --git a/test-kuttl/kuttl-test.yaml b/test-kuttl/kuttl-test.yaml index 830c1d4..9863ec6 100644 --- a/test-kuttl/kuttl-test.yaml +++ b/test-kuttl/kuttl-test.yaml @@ -3,4 +3,5 @@ apiVersion: kuttl.dev/v1beta1 kind: TestSuite testDirs: - ./e2e -timeout: 120 +timeout: 600 +parallel: 1