update strategy

Signed-off-by: Adam Stokes <[email protected]>
charmed-kubernetes · Sep 4, 2020 · b7cf21b · b7cf21b
1 parent e5a4e37
commit b7cf21b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/jobs/sync-upstream.yaml b/jobs/sync-upstream.yaml
@@ -59,7 +59,7 @@
     description: |
       Tags all downstream stable branches with bundle revision
     project-type: freestyle
-    node: runner-amd64
+    node: runner-cloud
     scm:
       - k8s-jenkins-jenkaas
     properties:
@@ -133,7 +133,7 @@
     description: |
       Refreshes all layer stable branches on top of master.
     project-type: freestyle
-    node: runner-amd64
+    node: runner-cloud
     scm:
       - k8s-jenkins-jenkaas
     properties:

diff --git a/jobs/sync-upstream/sync.py b/jobs/sync-upstream/sync.py
@@ -81,7 +81,7 @@ def _cut_stable_release(layer_list, charm_list, ancillary_list, filter_by_tag, d
                 git.config("user.name", "cdkbot", _cwd=identifier)
                 git.config("--global", "push.default", "simple")
                 git.checkout("-f", "stable", _cwd=identifier)
-                git.merge("master", "--no-ff", _cwd=identifier)
+                git.merge("master", "--no-ff", "-s", "ours", _cwd=identifier)
                 for line in git.push("origin", "stable", _cwd=identifier, _iter=True):
                     log.info(line)