diff --git a/.github/workflows/conformance.yaml b/.github/workflows/conformance.yaml index 655e8dcadf..e090891ee9 100644 --- a/.github/workflows/conformance.yaml +++ b/.github/workflows/conformance.yaml @@ -234,10 +234,9 @@ jobs: - name: Wait for kyverno ready uses: ./.github/actions/kyverno-wait-ready - name: Install Chainsaw - shell: bash - run: | - set -e - go install github.com/kyverno/chainsaw@ffa5508c1d0fbba24d70a3a51ef777392a9b32b6 + uses: kyverno/chainsaw/.github/actions/install@704abd5ea8fd74189e1192733a879a00a7d527f5 # main + with: + release: v0.0.6-alpha.1 - name: Test with Chainsaw shell: bash env: diff --git a/test/conformance/chainsaw/_config/common.yaml b/test/conformance/chainsaw/_config/common.yaml index 6b9d5ed588..2dcab9a9ae 100755 --- a/test/conformance/chainsaw/_config/common.yaml +++ b/test/conformance/chainsaw/_config/common.yaml @@ -4,7 +4,6 @@ metadata: name: congiguration spec: parallel: 1 - timeout: 1m30s fullName: true failFast: true excludeTestRegex: '_.+' diff --git a/test/conformance/chainsaw/webhooks/all-scale/01-policy.yaml b/test/conformance/chainsaw/webhooks/all-scale/01-policy.yaml index 836f640264..744135ecd0 100644 --- a/test/conformance/chainsaw/webhooks/all-scale/01-policy.yaml +++ b/test/conformance/chainsaw/webhooks/all-scale/01-policy.yaml @@ -1,11 +1,10 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: TestStep metadata: - creationTimestamp: null name: policy spec: - apply: - - file: policy.yaml - assert: - - file: policy-assert.yaml + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml diff --git a/test/conformance/chainsaw/webhooks/all-scale/02-webhooks.yaml b/test/conformance/chainsaw/webhooks/all-scale/02-webhooks.yaml index 549d5ba6af..be95983ce4 100644 --- a/test/conformance/chainsaw/webhooks/all-scale/02-webhooks.yaml +++ b/test/conformance/chainsaw/webhooks/all-scale/02-webhooks.yaml @@ -1,9 +1,8 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: TestStep metadata: - creationTimestamp: null name: webhooks spec: - assert: - - file: webhooks.yaml + try: + - assert: + file: webhooks.yaml diff --git a/test/conformance/chainsaw/webhooks/double-wildcard/01-policy.yaml b/test/conformance/chainsaw/webhooks/double-wildcard/01-policy.yaml index 836f640264..744135ecd0 100644 --- a/test/conformance/chainsaw/webhooks/double-wildcard/01-policy.yaml +++ b/test/conformance/chainsaw/webhooks/double-wildcard/01-policy.yaml @@ -1,11 +1,10 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: TestStep metadata: - creationTimestamp: null name: policy spec: - apply: - - file: policy.yaml - assert: - - file: policy-assert.yaml + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml diff --git a/test/conformance/chainsaw/webhooks/double-wildcard/02-webhooks.yaml b/test/conformance/chainsaw/webhooks/double-wildcard/02-webhooks.yaml index 549d5ba6af..be95983ce4 100644 --- a/test/conformance/chainsaw/webhooks/double-wildcard/02-webhooks.yaml +++ b/test/conformance/chainsaw/webhooks/double-wildcard/02-webhooks.yaml @@ -1,9 +1,8 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: TestStep metadata: - creationTimestamp: null name: webhooks spec: - assert: - - file: webhooks.yaml + try: + - assert: + file: webhooks.yaml diff --git a/test/conformance/chainsaw/webhooks/expected-webhooks/01-webhooks.yaml b/test/conformance/chainsaw/webhooks/expected-webhooks/01-webhooks.yaml index 549d5ba6af..be95983ce4 100644 --- a/test/conformance/chainsaw/webhooks/expected-webhooks/01-webhooks.yaml +++ b/test/conformance/chainsaw/webhooks/expected-webhooks/01-webhooks.yaml @@ -1,9 +1,8 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: TestStep metadata: - creationTimestamp: null name: webhooks spec: - assert: - - file: webhooks.yaml + try: + - assert: + file: webhooks.yaml diff --git a/test/conformance/chainsaw/webhooks/only-pod/01-policy.yaml b/test/conformance/chainsaw/webhooks/only-pod/01-policy.yaml index 836f640264..744135ecd0 100644 --- a/test/conformance/chainsaw/webhooks/only-pod/01-policy.yaml +++ b/test/conformance/chainsaw/webhooks/only-pod/01-policy.yaml @@ -1,11 +1,10 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: TestStep metadata: - creationTimestamp: null name: policy spec: - apply: - - file: policy.yaml - assert: - - file: policy-assert.yaml + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml diff --git a/test/conformance/chainsaw/webhooks/only-pod/02-webhooks.yaml b/test/conformance/chainsaw/webhooks/only-pod/02-webhooks.yaml index 549d5ba6af..be95983ce4 100644 --- a/test/conformance/chainsaw/webhooks/only-pod/02-webhooks.yaml +++ b/test/conformance/chainsaw/webhooks/only-pod/02-webhooks.yaml @@ -1,9 +1,8 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: TestStep metadata: - creationTimestamp: null name: webhooks spec: - assert: - - file: webhooks.yaml + try: + - assert: + file: webhooks.yaml diff --git a/test/conformance/chainsaw/webhooks/pod-all-subresources/01-policy.yaml b/test/conformance/chainsaw/webhooks/pod-all-subresources/01-policy.yaml index 836f640264..744135ecd0 100644 --- a/test/conformance/chainsaw/webhooks/pod-all-subresources/01-policy.yaml +++ b/test/conformance/chainsaw/webhooks/pod-all-subresources/01-policy.yaml @@ -1,11 +1,10 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: TestStep metadata: - creationTimestamp: null name: policy spec: - apply: - - file: policy.yaml - assert: - - file: policy-assert.yaml + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml diff --git a/test/conformance/chainsaw/webhooks/pod-all-subresources/02-webhooks.yaml b/test/conformance/chainsaw/webhooks/pod-all-subresources/02-webhooks.yaml index 549d5ba6af..be95983ce4 100644 --- a/test/conformance/chainsaw/webhooks/pod-all-subresources/02-webhooks.yaml +++ b/test/conformance/chainsaw/webhooks/pod-all-subresources/02-webhooks.yaml @@ -1,9 +1,8 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: TestStep metadata: - creationTimestamp: null name: webhooks spec: - assert: - - file: webhooks.yaml + try: + - assert: + file: webhooks.yaml diff --git a/test/conformance/chainsaw/webhooks/scale/01-policy.yaml b/test/conformance/chainsaw/webhooks/scale/01-policy.yaml index dfa674b5c1..b3b0a6a189 100644 --- a/test/conformance/chainsaw/webhooks/scale/01-policy.yaml +++ b/test/conformance/chainsaw/webhooks/scale/01-policy.yaml @@ -3,6 +3,8 @@ kind: TestStep metadata: name: policy spec: - apply: - - file: policy.yaml - shouldFail: true + try: + - apply: + file: policy.yaml + check: + (error == null): false diff --git a/test/conformance/chainsaw/webhooks/unknown-kind/01-unknown-kind.yaml b/test/conformance/chainsaw/webhooks/unknown-kind/01-unknown-kind.yaml index be147e1a1a..c681d90e23 100644 --- a/test/conformance/chainsaw/webhooks/unknown-kind/01-unknown-kind.yaml +++ b/test/conformance/chainsaw/webhooks/unknown-kind/01-unknown-kind.yaml @@ -3,6 +3,8 @@ kind: TestStep metadata: name: unknown-kind spec: - apply: - - file: policy-1.yaml - shouldFail: true + try: + - apply: + file: policy-1.yaml + check: + (error == null): false diff --git a/test/conformance/chainsaw/webhooks/unknown-kind/02-unknown-kind-subresource.yaml b/test/conformance/chainsaw/webhooks/unknown-kind/02-unknown-kind-subresource.yaml index 6837ef0c48..e51b99f8f8 100644 --- a/test/conformance/chainsaw/webhooks/unknown-kind/02-unknown-kind-subresource.yaml +++ b/test/conformance/chainsaw/webhooks/unknown-kind/02-unknown-kind-subresource.yaml @@ -3,6 +3,8 @@ kind: TestStep metadata: name: unknown-kind-subresource spec: - apply: - - file: policy-2.yaml - shouldFail: true + try: + - apply: + file: policy-2.yaml + check: + (error == null): false diff --git a/test/conformance/chainsaw/webhooks/unknown-kind/03-wrong-version.yaml b/test/conformance/chainsaw/webhooks/unknown-kind/03-wrong-version.yaml index 9e2f61d8a5..46edc9299c 100644 --- a/test/conformance/chainsaw/webhooks/unknown-kind/03-wrong-version.yaml +++ b/test/conformance/chainsaw/webhooks/unknown-kind/03-wrong-version.yaml @@ -3,6 +3,8 @@ kind: TestStep metadata: name: wrong-version spec: - apply: - - file: policy-3.yaml - shouldFail: true + try: + - apply: + file: policy-3.yaml + check: + (error == null): false diff --git a/test/conformance/chainsaw/webhooks/unknown-kind/04-unknown-subresource.yaml b/test/conformance/chainsaw/webhooks/unknown-kind/04-unknown-subresource.yaml index 5275bf0d8b..b06720170a 100644 --- a/test/conformance/chainsaw/webhooks/unknown-kind/04-unknown-subresource.yaml +++ b/test/conformance/chainsaw/webhooks/unknown-kind/04-unknown-subresource.yaml @@ -3,6 +3,8 @@ kind: TestStep metadata: name: unknown-subresource spec: - apply: - - file: policy-4.yaml - shouldFail: true + try: + - apply: + file: policy-4.yaml + check: + (error == null): false diff --git a/test/conformance/chainsaw/webhooks/wildcard/01-policy.yaml b/test/conformance/chainsaw/webhooks/wildcard/01-policy.yaml index 836f640264..744135ecd0 100644 --- a/test/conformance/chainsaw/webhooks/wildcard/01-policy.yaml +++ b/test/conformance/chainsaw/webhooks/wildcard/01-policy.yaml @@ -1,11 +1,10 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: TestStep metadata: - creationTimestamp: null name: policy spec: - apply: - - file: policy.yaml - assert: - - file: policy-assert.yaml + try: + - apply: + file: policy.yaml + - assert: + file: policy-assert.yaml diff --git a/test/conformance/chainsaw/webhooks/wildcard/02-webhooks.yaml b/test/conformance/chainsaw/webhooks/wildcard/02-webhooks.yaml index 549d5ba6af..be95983ce4 100644 --- a/test/conformance/chainsaw/webhooks/wildcard/02-webhooks.yaml +++ b/test/conformance/chainsaw/webhooks/wildcard/02-webhooks.yaml @@ -1,9 +1,8 @@ ---- apiVersion: chainsaw.kyverno.io/v1alpha1 kind: TestStep metadata: - creationTimestamp: null name: webhooks spec: - assert: - - file: webhooks.yaml + try: + - assert: + file: webhooks.yaml