Clean up spread; restore juju-k8s-crashdump artifact

Author: wctaylor

.github/workflows/charm_integration_test.yml

@@ -70,7 +70,7 @@ jobs:
           name: ${{ matrix.charm }}-charm
           path: "${{ matrix.charm }}/charm/*.charm"
 
-  define-matrix:
+  define-spread-matrix:
     name: Define spread matrix
     runs-on: ubuntu-24.04
     outputs:
@@ -93,13 +93,13 @@ jobs:
     name: Spread (${{ matrix.suite }})
     runs-on: ubuntu-24.04
     needs:
-      - define-matrix
+      - define-spread-matrix
       - lib-check
       - pack-charm
     strategy:
       fail-fast: true
       matrix:
-        suite: ${{ fromJSON(needs.define-matrix.outputs.suites) }}
+        suite: ${{ fromJSON(needs.define-spread-matrix.outputs.suites) }}
     steps:
       - name: Checkout
         uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4
@@ -132,7 +132,7 @@ jobs:
   
       - name: Run integration tests
         run: |
-          spread -v "github-ci:ubuntu-24.04:spread/${{ matrix.suite }}"
+          spread -v -artifacts "localhost:localhost-0:spread/${{ matrix.suite }}"
       
       - name: Sanitize suite name
         if: failure()

spread.yaml

@@ -130,6 +130,8 @@ prepare: |
     systemctl mask unattended-upgrades.service
   fi
 
+  apt update
+  apt install -y pipx
   snap install --classic concierge
   concierge prepare --trace --preset microk8s
 
@@ -139,3 +141,10 @@ prepare: |
 suites:
   spread/:
     summary: Test Observer Spread Suite
+
+restore: |
+  if [[ -z "${CI:-}" ]]; then
+    concierge restore --trace
+    snap remove concierge
+    apt remove -y pipx
+  fi

spread/integration/task.yaml

@@ -16,31 +16,37 @@ execute: |
   juju trust db --scope=cluster
   juju relate api db
 
-  # juju deploy nginx-ingress-integrator --channel=latest/stable --revision=59 ingress
-  # juju trust ingress --scope=cluster
-  # juju relate api ingress
-
   juju deploy "${SPREAD_PATH}"/frontend/charm/*.charm frontend \
     --config hostname=test-observer-frontend.test \
     --config test-observer-api-scheme='http://' \
     --resource frontend-image="${frontend_oci_image}"
   juju relate api frontend
 
-  juju wait-for application api --timeout=30m
+  juju wait-for application api --timeout=5m
   juju show-status-log api/0
 
-  juju wait-for application frontend --timeout=30m
+  juju wait-for application frontend --timeout=5m
   juju show-status-log frontend/0
 
-  juju run api/leader add-user launchpad-email=omar.selo@canonical.com --wait 3m
+  juju run api/leader add-user launchpad-email=solutions-qa@lists.canonical.com
 
-  PGPASSWORD=$(juju run db/leader get-password --wait 3m | grep password | awk '{print $2;}')
+  PGPASSWORD=$(juju run db/leader get-password | grep password | awk '{print $2;}')
   PGHOST=$(juju show-unit db/0 | grep address | tail -n 1 | awk '{print $2;}')
   PGUSER=operator
   PGDATABASE=test_observer_db
-  juju ssh --container postgresql db/leader "PGPASSWORD=$PGPASSWORD PGHOST=$PGHOST PGUSER=$PGUSER PGDATABASE=$PGDATABASE psql -c \"select launchpad_handle from app_user where email='omar.selo@canonical.com'\"" | grep omar-selo
+  juju ssh --container postgresql db/leader \
+    "PGPASSWORD=$PGPASSWORD PGHOST=$PGHOST PGUSER=$PGUSER PGDATABASE=$PGDATABASE psql -c \"select launchpad_handle from app_user where email='solutions-qa@lists.canonical.com'\"" \
+    | grep oil-ci-bot
+
+  microk8s config > kube-config
+  pipx run --spec git+https://github.com/canonical/juju-k8s-crashdump.git juju-k8s-crashdump ./kube-config concierge-microk8s -o integration-juju-k8s-crashdump.tar.gz
+
+artifacts:
+  - integration-juju-k8s-crashdump.tar.gz
 
 restore: |
-  # The testing model is created by concierge
-  juju destroy-model --destroy-storage --force --no-prompt --no-wait testing
-  juju add-model testing
+  if [[ -z "${CI:-}" ]]; then
+    # The testing model is created by concierge
+    juju destroy-model --destroy-storage --force --no-prompt --no-wait testing
+    juju add-model testing
+  fi