updatecli: use updatecli policies (#13934)

(cherry picked from commit 3351902) # Conflicts: # .ci/updatecli/values.d/scm.yml # .github/workflows/update-compose.yml # updatecli-compose.yaml
elastic · Sep 12, 2024 · 0be0ae5 · 0be0ae5
1 parent d2ccae1
commit 0be0ae5
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 0 deletions.
diff --git a/.ci/updatecli/values.d/scm.yml b/.ci/updatecli/values.d/scm.yml
@@ -3,7 +3,19 @@ scm:
   owner: elastic
   repository: apm-server
   branch: main
+<<<<<<< HEAD
   commitusingapi: true
   # begin updatecli-compose policy values
   user: obltmachine
   # end updatecli-compose policy values
+=======
+  # begin updatecli-compose policy values
+  user: obltmachine
+  email: [email protected]
+  commitusingapi: true
+  # end updatecli-compose policy values
+
+# This will be moved to the scm section in the future and use
+# commitusingapi instead.
+signedcommit: true
+>>>>>>> 3351902f8 (updatecli: use updatecli policies (#13934))
diff --git a/.github/workflows/update-compose.yml b/.github/workflows/update-compose.yml
@@ -18,7 +18,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+<<<<<<< HEAD
       - uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
+=======
+      - uses: docker/login-action@0d4c9c5ea7693da7b068278f7b52bda2a190a446 # v3.2.0
+>>>>>>> 3351902f8 (updatecli: use updatecli policies (#13934))
         with:
           registry: ghcr.io
           username: ${{ github.actor }}

diff --git a/updatecli-compose.yaml b/updatecli-compose.yaml
@@ -2,6 +2,7 @@
 # https://www.updatecli.io/docs/core/compose/
 policies:
   - name: Handle ironbank bumps
+<<<<<<< HEAD
     policy: ghcr.io/elastic/oblt-updatecli-policies/ironbank/templates:0.3.0@sha256:b0c841d8fb294e6b58359462afbc83070dca375ac5dd0c5216c8926872a98bb1
     values:
       - .ci/updatecli/values.d/scm.yml
@@ -11,3 +12,15 @@ policies:
     values:
       - .ci/updatecli/values.d/scm.yml
       - .ci/updatecli/values.d/updatecli-compose.yml
+=======
+    policy: ghcr.io/elastic/oblt-updatecli-policies/ironbank/templates:0.0.2@sha256:327ee971e3a974edc943f7f628145a47b202972f48e45c2054fddcd29f96a50a
+    values:
+      - .ci/updatecli/values.d/scm.yml
+      - .ci/updatecli/values.d/ironbank.yml
+
+  - name: Update Updatecli policies
+    policy: ghcr.io/updatecli/policies/autodiscovery/updatecli:0.4.0@sha256:254367f5b1454fd6032b88b314450cd3b6d5e8d5b6c953eb242a6464105eb869
+    values:
+      - .ci/updatecli/values.d/scm.yml
+      - .ci/updatecli/values.d/updatecli-compose.yml
+>>>>>>> 3351902f8 (updatecli: use updatecli policies (#13934))