From ca95cdf32848e883b14e545f5e4253bb333e8d82 Mon Sep 17 00:00:00 2001 From: Jonathan Dowland Date: Wed, 3 Apr 2024 10:43:06 +0100 Subject: [PATCH] Disable our feature files by default (#66) To prevent these feature files leaking out to all `cekit test` users, rename them with a ".disabled" suffix. They will still be cloned into every cekit test run, but will be ignored by behave. For our GHA tests, re-enable them by renaming to remove the suffix. Fixes #66. Signed-off-by: Jonathan Dowland --- .github/workflows/ubi9-openjdk-17-runtime.yml | 2 ++ test/tests/features/{file.feature => file.feature.disabled} | 0 test/tests/features/{gc.feature => gc.feature.disabled} | 0 .../features/{general.feature => general.feature.disabled} | 0 .../{java.runtime.feature => java.runtime.feature.disabled} | 0 .../{java.security.feature => java.security.feature.disabled} | 0 .../features/{java_s2i.feature => java_s2i.feature.disabled} | 0 .../{java_s2i_inc.feature => java_s2i_inc.feature.disabled} | 0 ...va_s2i_quarkus.feature => java_s2i_quarkus.feature.disabled} | 0 test/tests/features/{memory.feature => memory.feature.disabled} | 0 .../features/{openjdk.feature => openjdk.feature.disabled} | 0 .../features/{openshift.feature => openshift.feature.disabled} | 0 test/tests/features/{ports.feature => ports.feature.disabled} | 0 .../features/{runtime.feature => runtime.feature.disabled} | 0 .../features/{s2i-core.feature => s2i-core.feature.disabled} | 0 15 files changed, 2 insertions(+) rename test/tests/features/{file.feature => file.feature.disabled} (100%) rename test/tests/features/{gc.feature => gc.feature.disabled} (100%) rename test/tests/features/{general.feature => general.feature.disabled} (100%) rename test/tests/features/{java.runtime.feature => java.runtime.feature.disabled} (100%) rename test/tests/features/{java.security.feature => java.security.feature.disabled} (100%) rename test/tests/features/{java_s2i.feature => java_s2i.feature.disabled} (100%) rename test/tests/features/{java_s2i_inc.feature => java_s2i_inc.feature.disabled} (100%) rename test/tests/features/{java_s2i_quarkus.feature => java_s2i_quarkus.feature.disabled} (100%) rename test/tests/features/{memory.feature => memory.feature.disabled} (100%) rename test/tests/features/{openjdk.feature => openjdk.feature.disabled} (100%) rename test/tests/features/{openshift.feature => openshift.feature.disabled} (100%) rename test/tests/features/{ports.feature => ports.feature.disabled} (100%) rename test/tests/features/{runtime.feature => runtime.feature.disabled} (100%) rename test/tests/features/{s2i-core.feature => s2i-core.feature.disabled} (100%) diff --git a/.github/workflows/ubi9-openjdk-17-runtime.yml b/.github/workflows/ubi9-openjdk-17-runtime.yml index a8c779e..6671ea2 100644 --- a/.github/workflows/ubi9-openjdk-17-runtime.yml +++ b/.github/workflows/ubi9-openjdk-17-runtime.yml @@ -37,4 +37,6 @@ jobs: STEPSDIR=$(pwd) git tag v1 # cekit hard-codes using ref v1 cd test + # enable our own scenarios. See #66 for context. + for f in tests/features/*disabled; do mv "$f" "${f/.disabled/}"; done cekit -v test behave --steps-url file://$STEPSDIR diff --git a/test/tests/features/file.feature b/test/tests/features/file.feature.disabled similarity index 100% rename from test/tests/features/file.feature rename to test/tests/features/file.feature.disabled diff --git a/test/tests/features/gc.feature b/test/tests/features/gc.feature.disabled similarity index 100% rename from test/tests/features/gc.feature rename to test/tests/features/gc.feature.disabled diff --git a/test/tests/features/general.feature b/test/tests/features/general.feature.disabled similarity index 100% rename from test/tests/features/general.feature rename to test/tests/features/general.feature.disabled diff --git a/test/tests/features/java.runtime.feature b/test/tests/features/java.runtime.feature.disabled similarity index 100% rename from test/tests/features/java.runtime.feature rename to test/tests/features/java.runtime.feature.disabled diff --git a/test/tests/features/java.security.feature b/test/tests/features/java.security.feature.disabled similarity index 100% rename from test/tests/features/java.security.feature rename to test/tests/features/java.security.feature.disabled diff --git a/test/tests/features/java_s2i.feature b/test/tests/features/java_s2i.feature.disabled similarity index 100% rename from test/tests/features/java_s2i.feature rename to test/tests/features/java_s2i.feature.disabled diff --git a/test/tests/features/java_s2i_inc.feature b/test/tests/features/java_s2i_inc.feature.disabled similarity index 100% rename from test/tests/features/java_s2i_inc.feature rename to test/tests/features/java_s2i_inc.feature.disabled diff --git a/test/tests/features/java_s2i_quarkus.feature b/test/tests/features/java_s2i_quarkus.feature.disabled similarity index 100% rename from test/tests/features/java_s2i_quarkus.feature rename to test/tests/features/java_s2i_quarkus.feature.disabled diff --git a/test/tests/features/memory.feature b/test/tests/features/memory.feature.disabled similarity index 100% rename from test/tests/features/memory.feature rename to test/tests/features/memory.feature.disabled diff --git a/test/tests/features/openjdk.feature b/test/tests/features/openjdk.feature.disabled similarity index 100% rename from test/tests/features/openjdk.feature rename to test/tests/features/openjdk.feature.disabled diff --git a/test/tests/features/openshift.feature b/test/tests/features/openshift.feature.disabled similarity index 100% rename from test/tests/features/openshift.feature rename to test/tests/features/openshift.feature.disabled diff --git a/test/tests/features/ports.feature b/test/tests/features/ports.feature.disabled similarity index 100% rename from test/tests/features/ports.feature rename to test/tests/features/ports.feature.disabled diff --git a/test/tests/features/runtime.feature b/test/tests/features/runtime.feature.disabled similarity index 100% rename from test/tests/features/runtime.feature rename to test/tests/features/runtime.feature.disabled diff --git a/test/tests/features/s2i-core.feature b/test/tests/features/s2i-core.feature.disabled similarity index 100% rename from test/tests/features/s2i-core.feature rename to test/tests/features/s2i-core.feature.disabled