donotmerge: add debug logging to ingress test

Author: petrutlucian94

.github/workflows/build-snap.yml

@@ -57,6 +57,7 @@ jobs:
     name: Upgrade path test
     runs-on: ubuntu-22.04
     needs: build
+    timeout-minutes: 30
 
     steps:
       - name: Checking out repo
@@ -76,7 +77,9 @@ jobs:
           path: build
       - name: Running upgrade path test
         run: |
-          sudo -E UPGRADE_MICROK8S_FROM=latest/edge UPGRADE_MICROK8S_TO=$PWD/build/microk8s.snap pytest -s ./tests/test-upgrade-path.py
+          sudo -E UPGRADE_MICROK8S_FROM=latest/edge \
+            UPGRADE_MICROK8S_TO=$PWD/build/microk8s.snap \
+            pytest --log-cli-level debug -s ./tests/test-upgrade-path.py
 
   test-addons-core:
     name: Test core addons
@@ -145,6 +148,7 @@ jobs:
     name: Test core addons upgrade
     runs-on: ubuntu-22.04
     needs: build
+    timeout-minutes: 30
 
     steps:
       - name: Checking out repo
@@ -169,7 +173,7 @@ jobs:
           UNDER_TIME_PRESSURE: ${{ !contains(github.event.pull_request.labels.*.name, 'run-all-tests') }}
         run: |
           set -x
-          sudo -E bash -c "UPGRADE_MICROK8S_FROM=latest/edge UPGRADE_MICROK8S_TO=$PWD/build/microk8s.snap pytest -s ./tests/test-upgrade.py"
+          sudo -E bash -c "UPGRADE_MICROK8S_FROM=latest/edge UPGRADE_MICROK8S_TO=$PWD/build/microk8s.snap --log-cli-level debug pytest -s ./tests/test-upgrade.py"
 
   test-cluster-agent:
     name: Cluster agent health check

tests/test-upgrade.py

@@ -1,3 +1,4 @@
+import logging
 import os
 import platform
 import time
@@ -29,6 +30,9 @@
 under_time_pressure = os.environ.get("UNDER_TIME_PRESSURE", "false").lower()
 
 
+LOG = logging.getLogger(__name__)
+
+
 class TestUpgrade(object):
     """
     Validates a microk8s upgrade path
@@ -39,6 +43,8 @@ def test_upgrade(self):
         Deploy, probe, upgrade, validate nothing broke.
 
         """
+        LOG.setLevel(logging.DEBUG)
+        LOG.info("Starting upgrade test")
         print("Testing upgrade from {} to {}".format(upgrade_from, upgrade_to))
         if is_ipv6_configured:
             print("IPv6 is configured, will test dual stack")
@@ -91,7 +97,9 @@ def test_upgrade(self):
             print("Will not test storage")
 
         try:
+            LOG.info("Enabing ingress")
             enable = microk8s_enable("ingress")
+            LOG.info("Enabled ingress. Status: %s", enable)
             assert "Nothing to do for" not in enable
             validate_ingress()
             test_matrix["ingress"] = validate_ingress

tests/utils.py

@@ -1,3 +1,4 @@
+import logging
 import os.path
 import datetime
 import time
@@ -9,6 +10,8 @@
 
 arch_translate = {"aarch64": "arm64", "x86_64": "amd64"}
 
+LOG = logging.getLogger(__name__)
+
 
 def get_arch():
     """

tests/validators.py

@@ -1,3 +1,4 @@
+import logging
 import time
 import os
 import re
@@ -17,6 +18,8 @@
 
 TEMPLATES = Path(__file__).absolute().parent / "templates"
 
+LOG = logging.getLogger(__name__)
+
 
 def validate_dns_dashboard():
     """
@@ -89,7 +92,9 @@ def common_ingress():
     """
     attempt = 50
     while attempt >= 0:
+        LOG.info("Getting ingress")
         output = kubectl("get ing")
+        LOG.info("Got ingress: %s", output)
         if "microbot.127.0.0.1.nip.io" in output:
             break
         time.sleep(5)
@@ -100,11 +105,14 @@ def common_ingress():
     attempt = 50
     while attempt >= 0:
         try:
+            LOG.info("GET http://microbot.127.0.0.1.nip.io")
             resp = requests.get("http://microbot.127.0.0.1.nip.io/")
+            LOG.info("GET http://microbot.127.0.0.1.nip.io -> %s", resp)
             if resp.status_code == 200 and "microbot.png" in resp.content.decode("utf-8"):
                 service_ok = True
                 break
-        except requests.RequestException:
+        except requests.RequestException as ex:
+            LOG.info("GET http://microbot.127.0.0.1.nip.io -> %s", ex)
             time.sleep(5)
             attempt -= 1
 
@@ -115,20 +123,31 @@ def validate_ingress():
     """
     Validate ingress by creating a ingress rule.
     """
+
+    LOG.info("Validating ingress")
+
+    LOG.info("Retrieving daemonset")
     daemonset = kubectl("get ds")
+    LOG.info("Daemonset: %s\n", daemonset)
     if "nginx-ingress-microk8s-controller" in daemonset:
+        LOG.info("Waiting for default-http-backend pod")
         wait_for_pod_state("", "default", "running", label="app=default-http-backend")
+        LOG.info("Waiting for nginx-ingress-microk8s (default)")
         wait_for_pod_state("", "default", "running", label="name=nginx-ingress-microk8s")
     else:
+        LOG.info("Waiting for nginx-ingress-microk8s (ingress)")
         wait_for_pod_state("", "ingress", "running", label="name=nginx-ingress-microk8s")
 
     manifest = TEMPLATES / "ingress.yaml"
+    LOG.info("Applying ingress")
     update_yaml_with_arch(manifest)
     kubectl("apply -f {}".format(manifest))
+    LOG.info("Waiting for microbot")
     wait_for_pod_state("", "default", "running", label="app=microbot")
 
     common_ingress()
 
+    LOG.info("Deleting ingress")
     kubectl("delete -f {}".format(manifest))