You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by nf...@apache.org on 2020/02/11 10:48:47 UTC

[camel-k] branch master updated: chore(ci): fix failing master

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

nferraro 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 0c6d0ab  chore(ci): fix failing master
0c6d0ab is described below

commit 0c6d0abf35b7d999ba1eaf77f18a96a997387522
Author: Nicola Ferraro <ni...@gmail.com>
AuthorDate: Tue Feb 11 11:48:20 2020 +0100

    chore(ci): fix failing master
---
 .github/workflows/kubernetes.yml | 13 +++++----
 build/maven/pom-runtime.xml      | 62 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 68 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/kubernetes.yml b/.github/workflows/kubernetes.yml
index 7af7a39..bd577e2 100644
--- a/.github/workflows/kubernetes.yml
+++ b/.github/workflows/kubernetes.yml
@@ -72,12 +72,13 @@ jobs:
         kubectl cluster-info
         kubectl describe nodes
     - name: Run IT
-      env:
-        TEST_DOCKER_HUB_USERNAME: ${{ secrets.TEST_DOCKER_HUB_USERNAME }}
-        TEST_DOCKER_HUB_PASSWORD: ${{ secrets.TEST_DOCKER_HUB_PASSWORD }}
-        TEST_GITHUB_PACKAGES_REPO: ${{ secrets.TEST_GITHUB_PACKAGES_REPO }}
-        TEST_GITHUB_PACKAGES_USERNAME: ${{ secrets.TEST_GITHUB_PACKAGES_USERNAME }}
-        TEST_GITHUB_PACKAGES_PASSWORD: ${{ secrets.TEST_GITHUB_PACKAGES_PASSWORD }}
+      # Disable registry tests as not compatible with KinD
+      #env:
+      #  TEST_DOCKER_HUB_USERNAME: ${{ secrets.TEST_DOCKER_HUB_USERNAME }}
+      #  TEST_DOCKER_HUB_PASSWORD: ${{ secrets.TEST_DOCKER_HUB_PASSWORD }}
+      #  TEST_GITHUB_PACKAGES_REPO: ${{ secrets.TEST_GITHUB_PACKAGES_REPO }}
+      #  TEST_GITHUB_PACKAGES_USERNAME: ${{ secrets.TEST_GITHUB_PACKAGES_USERNAME }}
+      #  TEST_GITHUB_PACKAGES_PASSWORD: ${{ secrets.TEST_GITHUB_PACKAGES_PASSWORD }}
       run: |
         # Compute registry parameters
         CAMEL_K_REGISTRY=$(docker inspect --format '{{.NetworkSettings.IPAddress }}' "kind-registry")
diff --git a/build/maven/pom-runtime.xml b/build/maven/pom-runtime.xml
index 0764f56..e93d27b 100644
--- a/build/maven/pom-runtime.xml
+++ b/build/maven/pom-runtime.xml
@@ -24,7 +24,7 @@
 
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.apache.camel.k</groupId>
-    <artifactId>camel-k-catalog-generator</artifactId>
+    <artifactId>camel-k-runtime-builder</artifactId>
     <version>1.0.0</version>
 
     <dependencies>
@@ -98,51 +98,111 @@
             <groupId>org.apache.camel.k</groupId>
             <artifactId>camel-k-runtime-quarkus</artifactId>
             <version>${runtime.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.oracle.substratevm</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.k</groupId>
             <artifactId>camel-k-quarkus-loader-yaml</artifactId>
             <version>${runtime.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.oracle.substratevm</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.k</groupId>
             <artifactId>camel-k-quarkus-loader-knative</artifactId>
             <version>${runtime.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.oracle.substratevm</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.k</groupId>
             <artifactId>camel-k-quarkus-loader-xml</artifactId>
             <version>${runtime.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.oracle.substratevm</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.k</groupId>
             <artifactId>camel-k-quarkus-loader-js</artifactId>
             <version>${runtime.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.oracle.substratevm</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.k</groupId>
             <artifactId>camel-k-quarkus-loader-java</artifactId>
             <version>${runtime.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.oracle.substratevm</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.k</groupId>
             <artifactId>camel-k-quarkus-loader-groovy</artifactId>
             <version>${runtime.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.oracle.substratevm</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.k</groupId>
             <artifactId>camel-k-quarkus-loader-kotlin</artifactId>
             <version>${runtime.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.oracle.substratevm</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.k</groupId>
             <artifactId>camel-k-quarkus-core</artifactId>
             <version>${runtime.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.oracle.substratevm</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.apache.camel.k</groupId>
             <artifactId>camel-k-quarkus-knative</artifactId>
             <version>${runtime.version}</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>com.oracle.substratevm</groupId>
+                    <artifactId>*</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
 
         <!-- loaders -->