You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by as...@apache.org on 2021/01/08 10:46:19 UTC
[camel-k] branch release-1.3.x updated: Fix operator monitoring test
This is an automated email from the ASF dual-hosted git repository.
astefanutti pushed a commit to branch release-1.3.x
in repository https://gitbox.apache.org/repos/asf/camel-k.git
The following commit(s) were added to refs/heads/release-1.3.x by this push:
new 7e60102 Fix operator monitoring test
7e60102 is described below
commit 7e6010227cc0e67ef8c1c96c3626beb09b867606
Author: Lukas Lowinger <ll...@redhat.com>
AuthorDate: Wed Jan 6 10:22:01 2021 +0100
Fix operator monitoring test
---
e2e/yaks/openshift/monitoring/dependencyInstall.sh | 2 +-
e2e/yaks/openshift/monitoring/obtainToken.sh | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/e2e/yaks/openshift/monitoring/dependencyInstall.sh b/e2e/yaks/openshift/monitoring/dependencyInstall.sh
index ce129d2..6b019b0 100644
--- a/e2e/yaks/openshift/monitoring/dependencyInstall.sh
+++ b/e2e/yaks/openshift/monitoring/dependencyInstall.sh
@@ -19,7 +19,7 @@ SOURCE_DIR=$( dirname "${BASH_SOURCE[0]}")
APP_FOLDER="${SOURCE_DIR}/app"
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}')
+VERSION_CAMEL_QUARKUS=$(oc -n ${YAKS_NAMESPACE} get CamelCatalog camel-catalog-${VERSION_CAMEL_K_RUNTIME} -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)
diff --git a/e2e/yaks/openshift/monitoring/obtainToken.sh b/e2e/yaks/openshift/monitoring/obtainToken.sh
index a4bbe83..382d6f9 100755
--- a/e2e/yaks/openshift/monitoring/obtainToken.sh
+++ b/e2e/yaks/openshift/monitoring/obtainToken.sh
@@ -15,7 +15,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-TOKEN=`oc config view --minify --output 'jsonpath={..token}'`
+TOKEN=`oc whoami --show-token`
echo "openshift.token=${TOKEN}" > openshift-token.properties
oc -n ${YAKS_NAMESPACE} create secret generic openshift-token-secret-metrics --from-file=openshift-token.properties
oc -n ${YAKS_NAMESPACE} create secret generic openshift-token-secret-alerting --from-file=openshift-token.properties