Merge origin/release-3.6 into local branch, favoring local changes

codefresh-io · Dec 9, 2024 · 815b615 · 815b615
2 parents 2c1079c + 2891faa
commit 815b615
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 19 deletions.
diff --git a/manifests/quick-start-minimal.yaml b/manifests/quick-start-minimal.yaml
diff --git a/manifests/quick-start-mysql.yaml b/manifests/quick-start-mysql.yaml
diff --git a/manifests/quick-start-postgres.yaml b/manifests/quick-start-postgres.yaml
diff --git a/test/e2e/testdata/artifact-workflow-stopped.yaml b/test/e2e/testdata/artifact-workflow-stopped.yaml
@@ -15,7 +15,7 @@ spec:
     - metadata:
         name: artifacts
       spec:
-        accessModes: [ "ReadWriteOnce" ]
+        accessModes: ["ReadWriteOnce"]
         resources:
           requests:
             storage: 1Gi
@@ -53,7 +53,7 @@ spec:
             done
     - name: workflow-stopper
       container:
-        image: quay.io/argoproj/argocli:latest
+        image: quay.io/codefresh/argocli:latest
         imagePullPolicy: Never
         args:
           - stop

diff --git a/test/e2e/testdata/artifactgc/artgc-dag-wf-self-delete.yaml b/test/e2e/testdata/artifactgc/artgc-dag-wf-self-delete.yaml
@@ -20,7 +20,7 @@ spec:
     - metadata:
         name: artifacts
       spec:
-        accessModes: [ "ReadWriteOnce" ]
+        accessModes: ["ReadWriteOnce"]
         resources:
           requests:
             storage: 1Gi
@@ -59,7 +59,7 @@ spec:
             done
     - name: artgc-dag-workflow-deleter
       container:
-        image: quay.io/argoproj/argocli:latest
+        image: quay.io/codefresh/argocli:latest
         imagePullPolicy: Never
         args:
           - delete

diff --git a/test/e2e/testdata/artifactgc/artgc-dag-wf-stopped-pod-gc-on-pod-completion.yaml b/test/e2e/testdata/artifactgc/artgc-dag-wf-stopped-pod-gc-on-pod-completion.yaml
@@ -18,7 +18,7 @@ spec:
     - metadata:
         name: artifacts
       spec:
-        accessModes: [ "ReadWriteOnce" ]
+        accessModes: ["ReadWriteOnce"]
         resources:
           requests:
             storage: 1Gi
@@ -60,7 +60,7 @@ spec:
             done
     - name: artgc-dag-workflow-stopper
       container:
-        image: quay.io/argoproj/argocli:latest
+        image: quay.io/codefresh/argocli:latest
         imagePullPolicy: Never
         args:
           - stop

diff --git a/test/e2e/testdata/artifactgc/artgc-dag-wf-stopped.yaml b/test/e2e/testdata/artifactgc/artgc-dag-wf-stopped.yaml
@@ -20,7 +20,7 @@ spec:
     - metadata:
         name: artifacts
       spec:
-        accessModes: [ "ReadWriteOnce" ]
+        accessModes: ["ReadWriteOnce"]
         resources:
           requests:
             storage: 1Gi
@@ -62,7 +62,7 @@ spec:
             done
     - name: artgc-dag-workflow-stopper
       container:
-        image: quay.io/argoproj/argocli:latest
+        image: quay.io/codefresh/argocli:latest
         imagePullPolicy: Never
         args:
           - stop

diff --git a/test/e2e/testdata/retry-on-stopped.yaml b/test/e2e/testdata/retry-on-stopped.yaml
@@ -24,11 +24,11 @@ spec:
     - name: sleep
       container:
         image: alpine:latest
-        command: [ sleep, "10" ]
+        command: [sleep, "10"]
 
     - name: stop
       container:
-        image: quay.io/argoproj/argocli:latest
+        image: quay.io/codefresh/argocli:latest
         imagePullPolicy: Never
         args:
           - stop