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
The following commit(s) were added to refs/heads/main by this push:
new fea422211 fix(ci): join low and high memory Quarkus native test
fea422211 is described below
commit fea4222111d9e5ca924e5aae697d23261152d43c
Author: Pasquale Congiusti <[email protected]>
AuthorDate: Wed Jun 5 15:51:08 2024 +0200
fix(ci): join low and high memory Quarkus native test
Closes #5526
---
.github/actions/e2e-native/action.yml | 5 -----
.github/actions/e2e-native/exec-tests.sh | 6 +-----
.github/workflows/native.yml | 29 ++-------------------------
.github/workflows/nightly-native-test.yml | 8 +-------
docs/modules/ROOT/pages/contributing/e2e.adoc | 2 +-
e2e/native/native_binding_test.go | 4 ++--
e2e/native/native_test.go | 4 ++--
e2e/native/native_with_sources_test.go | 4 ++--
script/Makefile | 11 ++--------
9 files changed, 13 insertions(+), 60 deletions(-)
diff --git a/.github/actions/e2e-native/action.yml
b/.github/actions/e2e-native/action.yml
index ba1656478..aed604915 100644
--- a/.github/actions/e2e-native/action.yml
+++ b/.github/actions/e2e-native/action.yml
@@ -25,10 +25,6 @@ inputs:
cluster-kube-config-data:
description: 'Base16 encoded kube config - required for custom cluster
type only'
required: false
- high-memory:
- description: 'Indicates whether the high memory integration tests should
be launched (default false)'
- default: 'false'
- required: false
runs:
using: "composite"
@@ -108,7 +104,6 @@ runs:
-n "${{ steps.build-kamel.outputs.build-binary-local-image-name }}" \
-s "${{steps.config-cluster.outputs.cluster-image-registry-insecure
}}" \
-v "${{ steps.build-kamel.outputs.build-binary-local-image-version }}"
\
- -t "${{ inputs.high-memory }}" \
-q "${{ env.CAMEL_K_LOG_LEVEL }}" \
-x "${{ env.CAMEL_K_TEST_SAVE_FAILED_TEST_NAMESPACE }}"
diff --git a/.github/actions/e2e-native/exec-tests.sh
b/.github/actions/e2e-native/exec-tests.sh
index 53c14bf90..fe84ace5c 100755
--- a/.github/actions/e2e-native/exec-tests.sh
+++ b/.github/actions/e2e-native/exec-tests.sh
@@ -128,8 +128,4 @@ if [ "${LOG_LEVEL}" == "debug" ]; then
fi
# Then run integration tests
-if [ "${HIGH_MEMORY}" == "true" ]; then
- DO_TEST_PREBUILD=false GOTESTFMT="-json 2>&1 | gotestfmt" make
test-quarkus-native-high-memory
-else
- DO_TEST_PREBUILD=false GOTESTFMT="-json 2>&1 | gotestfmt" make
test-quarkus-native
-fi
+DO_TEST_PREBUILD=false GOTESTFMT="-json 2>&1 | gotestfmt" make
test-quarkus-native
diff --git a/.github/workflows/native.yml b/.github/workflows/native.yml
index 6c50f2ea8..fcd0e99e3 100644
--- a/.github/workflows/native.yml
+++ b/.github/workflows/native.yml
@@ -65,7 +65,7 @@ concurrency:
cancel-in-progress: true
jobs:
- higher-memory:
+ quarkus-native:
if: contains(github.event.pull_request.labels.*.name, 'trigger native
test')
runs-on: ubuntu-latest
@@ -83,34 +83,9 @@ jobs:
-p "${{ github.event.inputs.skip-problematic }}" \
-q "${{ github.event.inputs.log-level }}" \
-t "${{ github.event.inputs.test-filters }}"
- - name: Native test
+ - name: Quarkus Native test
uses: ./.github/actions/e2e-native
with:
cluster-config-data: ${{ secrets.E2E_CLUSTER_CONFIG }}
cluster-kube-config-data: ${{ secrets.E2E_KUBE_CONFIG }}
- high-memory: 'true'
- lower-memory:
- if: contains(github.event.pull_request.labels.*.name, 'trigger native
test')
- runs-on: ubuntu-latest
-
-
- steps:
- - name: Checkout code
- uses: actions/checkout@v4
- with:
- persist-credentials: false
- submodules: recursive
- - name: Convert input parameters to env vars
- shell: bash
- run: |
- ./.github/workflows/manual-exec-process-inputs.sh \
- -i "${{ github.event.inputs.pre-built-kamel-image }}" \
- -p "${{ github.event.inputs.skip-problematic }}" \
- -q "${{ github.event.inputs.log-level }}" \
- -t "${{ github.event.inputs.test-filters }}"
- - name: Native test
- uses: ./.github/actions/e2e-native
- with:
- cluster-config-data: ${{ secrets.E2E_CLUSTER_CONFIG }}
- cluster-kube-config-data: ${{ secrets.E2E_KUBE_CONFIG }}
diff --git a/.github/workflows/nightly-native-test.yml
b/.github/workflows/nightly-native-test.yml
index 7859ffaf7..8f90acc53 100644
--- a/.github/workflows/nightly-native-test.yml
+++ b/.github/workflows/nightly-native-test.yml
@@ -45,14 +45,8 @@ jobs:
ref: ${{ matrix.ref-branch }}
persist-credentials: false
submodules: recursive
- - name: Lower mem native smoke tests
+ - name: Quarkus native test
uses: ./.github/actions/e2e-native
with:
cluster-config-data: ${{ secrets.E2E_CLUSTER_CONFIG }}
cluster-kube-config-data: ${{ secrets.E2E_KUBE_CONFIG }}
- - name: Higher mem native smoke tests
- uses: ./.github/actions/e2e-native
- with:
- cluster-config-data: ${{ secrets.E2E_CLUSTER_CONFIG }}
- cluster-kube-config-data: ${{ secrets.E2E_KUBE_CONFIG }}
- high-memory: 'true'
diff --git a/docs/modules/ROOT/pages/contributing/e2e.adoc
b/docs/modules/ROOT/pages/contributing/e2e.adoc
index ffb0bded9..91b81d6bd 100644
--- a/docs/modules/ROOT/pages/contributing/e2e.adoc
+++ b/docs/modules/ROOT/pages/contributing/e2e.adoc
@@ -33,7 +33,7 @@ This is the list of the groups we are using (please, notice
that they can slight
* advanced (`make test-advanced`)
* install (`make test-install`, `make test-install-olm` and `make
test-install-upgrade`)
* knative (`make test-knative`)
- * native (`make test-quarkus-native` and `make
test-quarkus-native-high-memory`)
+ * native (`make test-quarkus-native`)
* telemetry (`make test-telemetry`)
Each group tests a specific feature of Camel K. Typically any new test should
be falling under the `common` group, unless it belongs to any other category or
it requires some particular customization. As an example, `telemetry` requires
the configuration of an OTLP Collector, reason why it requires its own group.
If the test still is a common one but needs to perform customization on the
Camel K Operator, then, it should be developed under `advanced`: as an example,
we have there tests w [...]
diff --git a/e2e/native/native_binding_test.go
b/e2e/native/native_binding_test.go
index bb7aeb6e8..8da442d7d 100644
--- a/e2e/native/native_binding_test.go
+++ b/e2e/native/native_binding_test.go
@@ -1,5 +1,5 @@
-//go:build integration && !high_memory
-// +build integration,!high_memory
+//go:build integration
+// +build integration
// To enable compilation of this file in Goland, go to "Settings -> Go ->
Vendoring & Build Tags -> Custom Tags" and add "integration"
diff --git a/e2e/native/native_test.go b/e2e/native/native_test.go
index ac726c04f..e1f751890 100644
--- a/e2e/native/native_test.go
+++ b/e2e/native/native_test.go
@@ -1,5 +1,5 @@
-//go:build integration && !high_memory
-// +build integration,!high_memory
+//go:build integration
+// +build integration
// To enable compilation of this file in Goland, go to "Settings -> Go ->
Vendoring & Build Tags -> Custom Tags" and add "integration"
diff --git a/e2e/native/native_with_sources_test.go
b/e2e/native/native_with_sources_test.go
index 989f612c1..dcfe148b3 100644
--- a/e2e/native/native_with_sources_test.go
+++ b/e2e/native/native_with_sources_test.go
@@ -1,5 +1,5 @@
-//go:build integration && high_memory
-// +build integration,high_memory
+//go:build integration
+// +build integration
// To enable compilation of this file in Goland, go to "Settings -> Go ->
Vendoring & Build Tags -> Custom Tags" and add "integration"
diff --git a/script/Makefile b/script/Makefile
index 42310fcf0..7293223e4 100644
--- a/script/Makefile
+++ b/script/Makefile
@@ -355,26 +355,19 @@ test-builder: do-build
go test -timeout 30m -v ./e2e/builder -tags=integration
$(TEST_BUILDER_RUN) $(GOTESTFMT)
#
-# Telemetry tests that require the configuration of telemtry endpoints
+# Telemetry tests that require the configuration of telemetry endpoints
#
test-telemetry: do-build
STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)" \
go test -timeout 30m -v ./e2e/telemetry -tags=integration
$(TEST_TELEMETRY_RUN) $(GOTESTFMT)
#
-# Quarkus native test which require a lower memory resources
+# Quarkus native test (requires certain CPU and memory conditions)
#
test-quarkus-native: do-build
STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)" \
go test -timeout 180m -v ./e2e/native -tags=integration
$(TEST_QUARKUS_RUN) $(GOTESTFMT)
-#
-# Quarkus native test which require a higher memory resources
-#
-test-quarkus-native-high-memory: do-build
- STAGING_RUNTIME_REPO="$(STAGING_RUNTIME_REPO)" \
- go test -timeout 180m -v ./e2e/native -tags=integration,high_memory
$(TEST_QUARKUS_RUN) $(GOTESTFMT)
-
build-kamel:
@echo "####### Building kamel CLI for linux/$(IMAGE_ARCH)
architecture..."
CGO_ENABLED=0 GOOS=linux GOARCH=$(IMAGE_ARCH) go build $(GOFLAGS) -o
build/_output/bin/kamel-$(IMAGE_ARCH) ./cmd/kamel/*.go
