[camel-k] branch master updated: [test] Detect camel quarkus version dynamically in monitoring test

[astefanutti]

This is an automated email from the ASF dual-hosted git repository.

astefanutti pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-k.git


The following commit(s) were added to refs/heads/master by this push:
     new 727a8d7  [test] Detect camel quarkus version dynamically in monitoring 
test
727a8d7 is described below

commit 727a8d76292da23c2a6655e9871502ac2c48cd02
Author: Lukas Lowinger <llowi...@redhat.com>
AuthorDate: Thu Oct 29 18:24:30 2020 +0100

    [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 e024a40..c515105 100644
--- a/e2e/yaks/openshift/monitoring/app/pom.xml
+++ b/e2e/yaks/openshift/monitoring/app/pom.xml
@@ -26,8 +26,6 @@
 
        <properties>
                
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-               <!-- Will be replaced by sed to test specific version. -->
-               <version.camel.quarkus>1.0.0-CR2</version.camel.quarkus>
        </properties>
 
        <dependencies>
diff --git a/e2e/yaks/openshift/monitoring/dependencyInstall.sh 
b/e2e/yaks/openshift/monitoring/dependencyInstall.sh
index 392a50d..6c63a83 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)