You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by pc...@apache.org on 2023/02/27 17:30:10 UTC
[camel-k] 06/19: fix: failing checks
This is an automated email from the ASF dual-hosted git repository.
pcongiusti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-k.git
commit 6dfa4175b27d63a2c054ec1197441b54382ecdb7
Author: Pasquale Congiusti <pa...@gmail.com>
AuthorDate: Wed Feb 22 13:08:16 2023 +0100
fix: failing checks
---
.github/actions/e2e-common/exec-tests.sh | 2 +-
.github/workflows/common.yml | 2 +-
e2e/install/kustomize/operator_test.go | 6 +++---
e2e/install/kustomize/setup_test.go | 4 ++--
e2e/install/kustomize/uninstall_test.go | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/.github/actions/e2e-common/exec-tests.sh b/.github/actions/e2e-common/exec-tests.sh
index 00ec6e804..507ca9f5c 100755
--- a/.github/actions/e2e-common/exec-tests.sh
+++ b/.github/actions/e2e-common/exec-tests.sh
@@ -137,7 +137,7 @@ fi
# Then run all integration tests rather than ending on first failure
set -e
exit_code=0
-if [ -z "${CUSTOM_INSTALL_TEST}" ]; then
+if [ ! -z "${CUSTOM_INSTALL_TEST}" ] && [ "${CUSTOM_INSTALL_TEST}" == "true" ]; then
DO_TEST_PREBUILD=false GOTESTFMT="-json 2>&1 | gotestfmt" make test-common-with-custom-install || exit_code=1
else
DO_TEST_PREBUILD=false GOTESTFMT="-json 2>&1 | gotestfmt" make test-common || exit_code=1
diff --git a/.github/workflows/common.yml b/.github/workflows/common.yml
index 5a47790a8..5502bebda 100644
--- a/.github/workflows/common.yml
+++ b/.github/workflows/common.yml
@@ -111,7 +111,7 @@ jobs:
-p "${{ github.event.inputs.skip-problematic }}" \
-q "${{ github.event.inputs.log-level }}" \
-t "${{ github.event.inputs.test-filters }}"
- - name: Execute Tests
+ - name: Common advanced tests
uses: ./.github/actions/e2e-common
with:
cluster-config-data: ${{ secrets.E2E_CLUSTER_CONFIG }}
diff --git a/e2e/install/kustomize/operator_test.go b/e2e/install/kustomize/operator_test.go
index 06c52f4cd..0ea799e79 100644
--- a/e2e/install/kustomize/operator_test.go
+++ b/e2e/install/kustomize/operator_test.go
@@ -35,7 +35,7 @@ import (
)
func TestOperatorBasic(t *testing.T) {
- makeDir := testutil.MakeTempCopyDir(t, "../../../../install")
+ makeDir := testutil.MakeTempCopyDir(t, "../../../install")
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
@@ -63,7 +63,7 @@ func TestOperatorBasic(t *testing.T) {
}
func TestOperatorAlternativeImage(t *testing.T) {
- makeDir := testutil.MakeTempCopyDir(t, "../../../../install")
+ makeDir := testutil.MakeTempCopyDir(t, "../../../install")
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
@@ -94,7 +94,7 @@ func TestOperatorAlternativeImage(t *testing.T) {
}
func TestOperatorGlobal(t *testing.T) {
- makeDir := testutil.MakeTempCopyDir(t, "../../../../install")
+ makeDir := testutil.MakeTempCopyDir(t, "../../../install")
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
diff --git a/e2e/install/kustomize/setup_test.go b/e2e/install/kustomize/setup_test.go
index cbe412bd4..e39902426 100644
--- a/e2e/install/kustomize/setup_test.go
+++ b/e2e/install/kustomize/setup_test.go
@@ -33,7 +33,7 @@ import (
)
func TestSetupBasic(t *testing.T) {
- makeDir := testutil.MakeTempCopyDir(t, "../../../../install")
+ makeDir := testutil.MakeTempCopyDir(t, "../../../install")
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
@@ -64,7 +64,7 @@ func TestSetupBasic(t *testing.T) {
}
func TestSetupGlobal(t *testing.T) {
- makeDir := testutil.MakeTempCopyDir(t, "../../../../install")
+ makeDir := testutil.MakeTempCopyDir(t, "../../../install")
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
diff --git a/e2e/install/kustomize/uninstall_test.go b/e2e/install/kustomize/uninstall_test.go
index 002ce3a7c..be6c56c22 100644
--- a/e2e/install/kustomize/uninstall_test.go
+++ b/e2e/install/kustomize/uninstall_test.go
@@ -35,7 +35,7 @@ import (
)
func TestUninstallBasic(t *testing.T) {
- makeDir := testutil.MakeTempCopyDir(t, "../../../../install")
+ makeDir := testutil.MakeTempCopyDir(t, "../../../install")
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed
@@ -76,7 +76,7 @@ func TestUninstallBasic(t *testing.T) {
}
func TestUninstallGlobal(t *testing.T) {
- makeDir := testutil.MakeTempCopyDir(t, "../../../../install")
+ makeDir := testutil.MakeTempCopyDir(t, "../../../install")
os.Setenv("CAMEL_K_TEST_MAKE_DIR", makeDir)
// Ensure no CRDs are already installed