You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ma...@apache.org on 2022/12/15 18:04:36 UTC
[camel-karavan] branch main updated: Fix Kamelet directory in Tekton Tasks
This is an automated email from the ASF dual-hosted git repository.
marat pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel-karavan.git
The following commit(s) were added to refs/heads/main by this push:
new b9bb7ef Fix Kamelet directory in Tekton Tasks
b9bb7ef is described below
commit b9bb7ef656e3c00a965a57c50c87e2bb21c9f2af
Author: Marat Gubaidullin <ma...@gmail.com>
AuthorDate: Thu Dec 15 13:04:29 2022 -0500
Fix Kamelet directory in Tekton Tasks
---
.../resources/quarkus-builder-script-kubernetes.sh | 23 ++++++----------------
.../resources/quarkus-builder-script-openshift.sh | 23 ++++++----------------
.../spring-boot-builder-script-kubernetes.sh | 23 ++++++----------------
.../spring-boot-builder-script-openshift.sh | 23 ++++++----------------
4 files changed, 24 insertions(+), 68 deletions(-)
diff --git a/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh b/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
index e3d551a..d7eacb0 100644
--- a/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
+++ b/karavan-operator/src/main/resources/quarkus-builder-script-kubernetes.sh
@@ -1,26 +1,15 @@
#!/usr/bin/env bash
-KAMELETS_DIR="/kamelets"
-
-if [[ $KAMELETS_GIT_REPOSITORY == https* ]] ;
-then
- replacer=https://$KAMELETS_GIT_PASSWORD@
- prefix=https://
- url="${KAMELETS_GIT_REPOSITORY/$prefix/$replacer}"
- git clone --depth 1 --branch ${KAMELETS_GIT_BRANCH} $url ${KAMELETS_DIR}
-else
- git clone --depth 1 --branch ${KAMELETS_GIT_BRANCH} ${KAMELETS_GIT_REPOSITORY} ${KAMELETS_DIR}
-fi
-
CHECKOUT_DIR="/scripts"
+KAMELETS_DIR="/scripts/kamelets"
-if [[ $PROJECTS_GIT_REPOSITORY == https* ]] ;
+if [[ $GIT_REPOSITORY == https* ]] ;
then
- replacer=https://$PROJECTS_GIT_PASSWORD@
+ replacer=https://$GIT_PASSWORD@
prefix=https://
- url="${PROJECTS_GIT_REPOSITORY/$prefix/$replacer}"
- git clone --depth 1 --branch ${PROJECTS_GIT_BRANCH} $url ${CHECKOUT_DIR}
+ url="${GIT_REPOSITORY/$prefix/$replacer}"
+ git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
else
- git clone --depth 1 --branch ${PROJECTS_GIT_BRANCH} ${PROJECTS_GIT_REPOSITORY} ${CHECKOUT_DIR}
+ git clone --depth 1 --branch ${GIT_BRANCH} ${GIT_REPOSITORY} ${CHECKOUT_DIR}
fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
diff --git a/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh b/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
index 7d5230a..df60581 100644
--- a/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
+++ b/karavan-operator/src/main/resources/quarkus-builder-script-openshift.sh
@@ -1,26 +1,15 @@
#!/usr/bin/env bash
-KAMELETS_DIR="/kamelets"
-
-if [[ $KAMELETS_GIT_REPOSITORY == https* ]] ;
-then
- replacer=https://$KAMELETS_GIT_PASSWORD@
- prefix=https://
- url="${KAMELETS_GIT_REPOSITORY/$prefix/$replacer}"
- git clone --depth 1 --branch ${KAMELETS_GIT_BRANCH} $url ${KAMELETS_DIR}
-else
- git clone --depth 1 --branch ${KAMELETS_GIT_BRANCH} ${KAMELETS_GIT_REPOSITORY} ${KAMELETS_DIR}
-fi
-
CHECKOUT_DIR="/scripts"
+KAMELETS_DIR="/scripts/kamelets"
-if [[ $PROJECTS_GIT_REPOSITORY == https* ]] ;
+if [[ $GIT_REPOSITORY == https* ]] ;
then
- replacer=https://$PROJECTS_GIT_PASSWORD@
+ replacer=https://$GIT_PASSWORD@
prefix=https://
- url="${PROJECTS_GIT_REPOSITORY/$prefix/$replacer}"
- git clone --depth 1 --branch ${PROJECTS_GIT_BRANCH} $url ${CHECKOUT_DIR}
+ url="${GIT_REPOSITORY/$prefix/$replacer}"
+ git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
else
- git clone --depth 1 --branch ${PROJECTS_GIT_BRANCH} ${PROJECTS_GIT_REPOSITORY} ${CHECKOUT_DIR}
+ git clone --depth 1 --branch ${GIT_BRANCH} ${GIT_REPOSITORY} ${CHECKOUT_DIR}
fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
diff --git a/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh b/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh
index aedac75..8f0f17f 100644
--- a/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh
+++ b/karavan-operator/src/main/resources/spring-boot-builder-script-kubernetes.sh
@@ -1,26 +1,15 @@
#!/usr/bin/env bash
-KAMELETS_DIR="/kamelets"
-
-if [[ $KAMELETS_GIT_REPOSITORY == https* ]] ;
-then
- replacer=https://$KAMELETS_GIT_PASSWORD@
- prefix=https://
- url="${KAMELETS_GIT_REPOSITORY/$prefix/$replacer}"
- git clone --depth 1 --branch ${KAMELETS_GIT_BRANCH} $url ${KAMELETS_DIR}
-else
- git clone --depth 1 --branch ${KAMELETS_GIT_BRANCH} ${KAMELETS_GIT_REPOSITORY} ${KAMELETS_DIR}
-fi
-
CHECKOUT_DIR="/scripts"
+KAMELETS_DIR="/scripts/kamelets"
-if [[ $PROJECTS_GIT_REPOSITORY == https* ]] ;
+if [[ $GIT_REPOSITORY == https* ]] ;
then
- replacer=https://$PROJECTS_GIT_PASSWORD@
+ replacer=https://$GIT_PASSWORD@
prefix=https://
- url="${PROJECTS_GIT_REPOSITORY/$prefix/$replacer}"
- git clone --depth 1 --branch ${PROJECTS_GIT_BRANCH} $url ${CHECKOUT_DIR}
+ url="${GIT_REPOSITORY/$prefix/$replacer}"
+ git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
else
- git clone --depth 1 --branch ${PROJECTS_GIT_BRANCH} ${PROJECTS_GIT_REPOSITORY} ${CHECKOUT_DIR}
+ git clone --depth 1 --branch ${GIT_BRANCH} ${GIT_REPOSITORY} ${CHECKOUT_DIR}
fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)
diff --git a/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh b/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh
index 30a1256..6330fd5 100644
--- a/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh
+++ b/karavan-operator/src/main/resources/spring-boot-builder-script-openshift.sh
@@ -1,26 +1,15 @@
#!/usr/bin/env bash
-KAMELETS_DIR="/kamelets"
-
-if [[ $KAMELETS_GIT_REPOSITORY == https* ]] ;
-then
- replacer=https://$KAMELETS_GIT_PASSWORD@
- prefix=https://
- url="${KAMELETS_GIT_REPOSITORY/$prefix/$replacer}"
- git clone --depth 1 --branch ${KAMELETS_GIT_BRANCH} $url ${KAMELETS_DIR}
-else
- git clone --depth 1 --branch ${KAMELETS_GIT_BRANCH} ${KAMELETS_GIT_REPOSITORY} ${KAMELETS_DIR}
-fi
-
CHECKOUT_DIR="/scripts"
+KAMELETS_DIR="/scripts/kamelets"
-if [[ $PROJECTS_GIT_REPOSITORY == https* ]] ;
+if [[ $GIT_REPOSITORY == https* ]] ;
then
- replacer=https://$PROJECTS_GIT_PASSWORD@
+ replacer=https://$GIT_PASSWORD@
prefix=https://
- url="${PROJECTS_GIT_REPOSITORY/$prefix/$replacer}"
- git clone --depth 1 --branch ${PROJECTS_GIT_BRANCH} $url ${CHECKOUT_DIR}
+ url="${GIT_REPOSITORY/$prefix/$replacer}"
+ git clone --depth 1 --branch ${GIT_BRANCH} $url ${CHECKOUT_DIR}
else
- git clone --depth 1 --branch ${PROJECTS_GIT_BRANCH} ${PROJECTS_GIT_REPOSITORY} ${CHECKOUT_DIR}
+ git clone --depth 1 --branch ${GIT_BRANCH} ${GIT_REPOSITORY} ${CHECKOUT_DIR}
fi
cd ${CHECKOUT_DIR}/$(inputs.params.project)