cohre(*) logs

Signed-off-by: Nikolay Nikolaev <nikolay.nikolaev@konghq.com>
kumahq · May 13, 2020 · 9a02e83 · 9a02e83
1 parent 1fec421
commit 9a02e83
Show file tree

Hide file tree

Showing 3 changed files with 79 additions and 63 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -10,7 +10,7 @@ reusable:
   - &circleci_golang_image "circleci/golang:1.14.2"
 
   vm_images:
-  - &ubuntu_vm_image "ubuntu-1604:201903-01"
+  - &ubuntu_vm_image "ubuntu-1604:202004-01"
 
   snippets:
 
@@ -418,6 +418,10 @@ jobs:
     - run:
         name: Verify traffic routing with mTLS
         command: make verify/traffic-routing/docker-compose/with-mtls
+    - run:
+        name: Logs
+        command: docker-compose -f tools/e2e/examples/docker-compose/docker-compose.yaml logs
+        when: always
 
   example_minikube:
     executor: vm
@@ -542,27 +546,27 @@ workflows:
   version: 2
   kuma-commit:
     jobs:
-    - dev_golang
-    - dev_mac
-    - dev_ubuntu
+#    - dev_golang
+#    - dev_mac
+#    - dev_ubuntu
     - go_cache
-    - api_check:
-        requires:
-        - go_cache
-    - check:
-        requires:
-        - go_cache
+#    - api_check:
+#        requires:
+#        - go_cache
+#    - check:
+#        requires:
+#        - go_cache
     - build:
         requires:
         - go_cache
-    - test:
-        requires:
-        - api_check
-        - check
-    - integration:
-        requires:
-        - api_check
-        - check
+#    - test:
+#        requires:
+#        - api_check
+#        - check
+#    - integration:
+#        requires:
+#        - api_check
+#        - check
     - images:
         requires:
         - build
@@ -572,48 +576,48 @@ workflows:
         - images
         # custom parameters
         use_local_kuma_images: true
-    - example_minikube:
-        name: minikube_v1_13_0
-        requires:
-        - images
-        # custom parameters
-        kubernetes_version: v1.13.0
-        use_local_kuma_images: true
-    - example_minikube:
-        name: minikube_v1_14_0
-        requires:
-        - images
-        # custom parameters
-        kubernetes_version: v1.14.0
-        use_local_kuma_images: true
-    - example_minikube:
-        name: minikube_v1_15_0
-        requires:
-        - images
-        # custom parameters
-        kubernetes_version: v1.15.0
-        use_local_kuma_images: true
-    - example_minikube:
-        name: minikube_v1_16_0
-        requires:
-        - images
-        # custom parameters
-        kubernetes_version: v1.16.0
-        use_local_kuma_images: true
-    - example_minikube:
-        name: minikube_v1_17_0
-        requires:
-        - images
-        # custom parameters
-        kubernetes_version: v1.17.0
-        use_local_kuma_images: true
-    - example_minikube:
-        name: minikube_v1_18_2
-        requires:
-          - images
-        # custom parameters
-        kubernetes_version: v1.18.2
-        use_local_kuma_images: true
+#    - example_minikube:
+#        name: minikube_v1_13_0
+#        requires:
+#        - images
+#        # custom parameters
+#        kubernetes_version: v1.13.0
+#        use_local_kuma_images: true
+#    - example_minikube:
+#        name: minikube_v1_14_0
+#        requires:
+#        - images
+#        # custom parameters
+#        kubernetes_version: v1.14.0
+#        use_local_kuma_images: true
+#    - example_minikube:
+#        name: minikube_v1_15_0
+#        requires:
+#        - images
+#        # custom parameters
+#        kubernetes_version: v1.15.0
+#        use_local_kuma_images: true
+#    - example_minikube:
+#        name: minikube_v1_16_0
+#        requires:
+#        - images
+#        # custom parameters
+#        kubernetes_version: v1.16.0
+#        use_local_kuma_images: true
+#    - example_minikube:
+#        name: minikube_v1_17_0
+#        requires:
+#        - images
+#        # custom parameters
+#        kubernetes_version: v1.17.0
+#        use_local_kuma_images: true
+#    - example_minikube:
+#        name: minikube_v1_18_2
+#        requires:
+#          - images
+#        # custom parameters
+#        kubernetes_version: v1.18.2
+#        use_local_kuma_images: true
 
   kuma-release:
     jobs:

diff --git a/tools/e2e/examples/docker-compose/docker-compose.yaml b/tools/e2e/examples/docker-compose/docker-compose.yaml
@@ -52,7 +52,7 @@ services:
   #
   kuma-example-installer:
     # image name must be provided via environment variable KUMACTL_DOCKER_IMAGE
-    image: ${KUMACTL_DOCKER_IMAGE:-kuma/kumactl:latest}
+    image: ${KUMACTL_DOCKER_IMAGE}
     volumes:
     - ./kuma-example-installer.sh:/kuma-example/kuma-example-installer.sh
     - token-example-app:/kuma-example-app:rw

diff --git a/tools/e2e/examples/docker-compose/kuma-example-installer.sh b/tools/e2e/examples/docker-compose/kuma-example-installer.sh
@@ -1,13 +1,14 @@
 #!/usr/bin/env sh
 
-set -e
+set -xe
 
 #
 # Utility functions
 #
 
 function resolve_ip {
-  LC_ALL=C nslookup ${DATAPLANE_HOSTNAME} 2>/dev/null  | sed -nr '/Name/,+1s|Address(es)?: *||p'
+#  LC_ALL=C nslookup ${DATAPLANE_HOSTNAME} 2>/dev/null  | sed -nr '/Name/,+1s|Address(es)?: *||p'
+  getent hosts ${DATAPLANE_HOSTNAME} 2>/dev/null | awk -e '{ print $1 }'
 }
 
 function fail {
@@ -26,6 +27,17 @@ function create_dataplane {
   # Resolve IP address allocated to the "${DATAPLANE_NAME}" container
   #
 
+  echo "-------------"
+  cat /etc/resolv.conf
+  echo "-------------"
+  cat /etc/hosts
+  echo "-------------"
+  getent hosts ${DATAPLANE_HOSTNAME}
+#  LC_ALL=C nslookup ${DATAPLANE_HOSTNAME}
+  echo "-------------"
+#  LC_ALL=C nslookup ${DATAPLANE_HOSTNAME} 2>/dev/null  | sed -nr '/Name/,+1s|Address(es)?: *||p'
+  echo "-------------"
+
   DATAPLANE_IP_ADDRESS=$( resolve_ip ${DATAPLANE_HOSTNAME} )
   if [ -z "${DATAPLANE_IP_ADDRESS}" ]; then
     fail "failed to resolve IP address allocated to the '${DATAPLANE_HOSTNAME}' container"