Switch back to using main branch of operator-workflows

canonical · May 9, 2024 · 18db955 · 18db955
1 parent d472d1e
commit 18db955
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 169 deletions.
diff --git a/.github/workflows/auto-update-libs-k8s-worker.yaml b/.github/workflows/auto-update-libs-k8s-worker.yaml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   auto-update-libs:
-    uses: canonical/operator-workflows/.github/workflows/auto_update_charm_libs.yaml@08c5a65a0bc4696164b4f85a29a9ccbd830d10d8
+    uses: canonical/operator-workflows/.github/workflows/auto_update_charm_libs.yaml@main
     secrets: inherit
     with:
       working-directory:  ./charms/worker/k8s
diff --git a/.github/workflows/build-charm.yaml b/.github/workflows/build-charm.yaml
diff --git a/.github/workflows/charm-analysis.yaml b/.github/workflows/charm-analysis.yaml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   unit-tests:
-    uses: canonical/operator-workflows/.github/workflows/test.yaml@08c5a65a0bc4696164b4f85a29a9ccbd830d10d8
+    uses: canonical/operator-workflows/.github/workflows/test.yaml@main
     secrets: inherit
     with:
       charm-directory: charms

diff --git a/.github/workflows/comment.yaml b/.github/workflows/comment.yaml
@@ -8,5 +8,5 @@ on:
 
 jobs:
   comment-on-pr:
-    uses: canonical/operator-workflows/.github/workflows/comment.yaml@08c5a65a0bc4696164b4f85a29a9ccbd830d10d8
+    uses: canonical/operator-workflows/.github/workflows/comment.yaml@main
     secrets: inherit
diff --git a/.github/workflows/integration_test.yaml b/.github/workflows/integration_test.yaml
@@ -5,7 +5,6 @@ on:
   pull_request:
 
 jobs:
-
   extra-args:
     runs-on: ubuntu-latest
     outputs:
@@ -24,41 +23,28 @@ jobs:
           fi
           echo "args=$EXTRA_ARGS" >> "$GITHUB_OUTPUT"
 
-  build-all-charms:
+  integration-tests:
+    uses: addyess/operator-workflows/.github/workflows/integration_test.yaml@multiarch-building
     needs: [extra-args]
+    secrets: inherit
     strategy:
       matrix:
         arch:
-          - arch: amd64
-            runs-on-label: X64
-          - arch: arm64
-            runs-on-label: ARM64
-        path:
-          - "./charms/worker/k8s/"
-          - "./charms/worker/"
-    uses: ./.github/workflows/build-charm.yaml
-    with:
-      working-directory:  ${{ matrix.path }}
-      arch: ${{ matrix.arch.arch }}
-      runs-on-label: ${{ matrix.arch.runs-on-label }}
-
-  integration-tests:
-    uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@08c5a65a0bc4696164b4f85a29a9ccbd830d10d8
-    needs: [build-all-charms, extra-args]
-    strategy:
-      matrix:
-        suite: ["k8s", "etcd"]
-    secrets: inherit
+          - {id: amd64, builder-label: ubuntu-22.04, tester-label: large}
+#          - {id: arm64, builder-label: ARM64, tester-label: ARM64}
     with:
+      identifier: ${{matrix.arch.id}}
       provider: lxd
       juju-channel: 3.3/stable
-      extra-arguments: ${{needs.extra-args.outputs.args}} -k test_${{ matrix.suite }}
+      extra-arguments: ${{needs.extra-args.outputs.args}}
       load-test-enabled: false
+      builder-runner-label: ${{matrix.arch.builder-label}}
+      modules: '["test_k8s", "test_etcd"]'
       zap-enabled: false
-      self-hosted-runner: true
-      self-hosted-runner-label: "large"
+      # self-hosted-runner: true
+      # self-hosted-runner-label: ${{matrix.arch.tester-label}}
       trivy-fs-enabled: true
       trivy-image-config: "trivy.yaml"
       tmate-debug: true
       test-timeout: 120
-      test-tox-env: integration-${{ matrix.suite }}
+      test-tox-env: integration
diff --git a/.github/workflows/integration_test_betterbuild.yaml b/.github/workflows/integration_test_betterbuild.yaml
diff --git a/.github/workflows/load_test.yaml b/.github/workflows/load_test.yaml
@@ -6,7 +6,7 @@ on:
 
 jobs:
   load-tests:
-    uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@08c5a65a0bc4696164b4f85a29a9ccbd830d10d8
+    uses: canonical/operator-workflows/.github/workflows/integration_test.yaml@main
     with:
       provider: lxd
       juju-channel: 3.3/stable

diff --git a/.github/workflows/promote-charms.yaml b/.github/workflows/promote-charms.yaml
@@ -67,10 +67,11 @@ jobs:
     strategy:
       matrix:
         charm-directory: ${{ fromJson(needs.select-charms.outputs.charms) }}
-    uses: canonical/operator-workflows/.github/workflows/promote_charm.yaml@08c5a65a0bc4696164b4f85a29a9ccbd830d10d8
+        arch: [amd64, arm64]
+    uses: canonical/operator-workflows/.github/workflows/promote_charm.yaml@main
     with:
-      origin-channel: ${{needs.configure-track.outputs.track}}/${{ github.event.inputs.origin-risk }}
+      base-architecture: ${{ matrix.arch }}
+      charm-directory: ${{ matrix.charm-directory }}
       destination-channel: ${{needs.configure-track.outputs.track}}/${{ github.event.inputs.destination-risk }}
-      charm-directory: ./charms
-      working-directory:  ${{ matrix.charm-directory }}
+      origin-channel: ${{needs.configure-track.outputs.track}}/${{ github.event.inputs.origin-risk }}
     secrets: inherit