From 7923b9c0c646a17e0e224939e66f24f931927ce7 Mon Sep 17 00:00:00 2001 From: Lukas Lowinger Date: Thu, 29 Oct 2020 18:24:30 +0100 Subject: [PATCH] [test] Detect camel quarkus version dynamically in monitoring test --- e2e/yaks/openshift/monitoring/app/pom.xml | 2 -- e2e/yaks/openshift/monitoring/dependencyInstall.sh | 5 ++++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/e2e/yaks/openshift/monitoring/app/pom.xml b/e2e/yaks/openshift/monitoring/app/pom.xml index e024a40feb..c515105e2e 100644 --- a/e2e/yaks/openshift/monitoring/app/pom.xml +++ b/e2e/yaks/openshift/monitoring/app/pom.xml @@ -26,8 +26,6 @@ UTF-8 - - 1.0.0-CR2 diff --git a/e2e/yaks/openshift/monitoring/dependencyInstall.sh b/e2e/yaks/openshift/monitoring/dependencyInstall.sh index 392a50d622..6c63a83f50 100644 --- a/e2e/yaks/openshift/monitoring/dependencyInstall.sh +++ b/e2e/yaks/openshift/monitoring/dependencyInstall.sh @@ -18,7 +18,10 @@ SOURCE_DIR=$( dirname "${BASH_SOURCE[0]}") APP_FOLDER="${SOURCE_DIR}/app" -mvn clean install -f $APP_FOLDER +VERSION_CAMEL_K_RUNTIME=$(oc -n ${YAKS_NAMESPACE} get IntegrationPlatform camel-k -o 'jsonpath={.status.build.runtimeVersion}') +VERSION_CAMEL_QUARKUS=$(oc -n ${YAKS_NAMESPACE} get CamelCatalog camel-catalog-${VERSION_CAMEL_K_RUNTIME}-main -o 'jsonpath={.spec.runtime.metadata.camel-quarkus\.version}') + +mvn clean install -f $APP_FOLDER -Dversion.camel.quarkus=${VERSION_CAMEL_QUARKUS} LOCAL_MVN_HOME=$(mvn help:evaluate -Dexpression=settings.localRepository -q -DforceStdout) OPERATOR_POD=$(oc -n ${YAKS_NAMESPACE} get pods -l name=camel-k-operator --no-headers -o custom-columns=NAME:.metadata.name)