feat: add ramendr-ci pipeline support

README.md

@@ -42,6 +42,18 @@ This chart is used to serve as the template for Validated Patterns Charts
 | qeCIPipelines.defaults.networking.clusterNetwork[0].cidr | string | `"10.128.0.0/14"` |  |
 | qeCIPipelines.defaults.networking.clusterNetwork[0].hostPrefix | int | `23` |  |
 | qeCIPipelines.defaults.networking.machineNetwork[0].cidr | string | `"10.0.0.0/16"` |  |
+| qeCIPipelines.defaults.networking.multiDr.hub.clusterHostPrefix | int | `23` |  |
+| qeCIPipelines.defaults.networking.multiDr.hub.clusterNetworkCidr | string | `"10.128.0.0/14"` |  |
+| qeCIPipelines.defaults.networking.multiDr.hub.machineNetworkCidr | string | `"10.0.0.0/16"` |  |
+| qeCIPipelines.defaults.networking.multiDr.hub.serviceNetworkCidr | string | `"172.30.0.0/16"` |  |
+| qeCIPipelines.defaults.networking.multiDr.spokePrimary.clusterHostPrefix | int | `23` |  |
+| qeCIPipelines.defaults.networking.multiDr.spokePrimary.clusterNetworkCidr | string | `"10.132.0.0/14"` |  |
+| qeCIPipelines.defaults.networking.multiDr.spokePrimary.machineNetworkCidr | string | `"10.1.0.0/16"` |  |
+| qeCIPipelines.defaults.networking.multiDr.spokePrimary.serviceNetworkCidr | string | `"172.31.0.0/16"` |  |
+| qeCIPipelines.defaults.networking.multiDr.spokeSecondary.clusterHostPrefix | int | `23` |  |
+| qeCIPipelines.defaults.networking.multiDr.spokeSecondary.clusterNetworkCidr | string | `"10.136.0.0/14"` |  |
+| qeCIPipelines.defaults.networking.multiDr.spokeSecondary.machineNetworkCidr | string | `"10.2.0.0/16"` |  |
+| qeCIPipelines.defaults.networking.multiDr.spokeSecondary.serviceNetworkCidr | string | `"172.32.0.0/16"` |  |
 | qeCIPipelines.defaults.networking.networkType | string | `"OVNKubernetes"` |  |
 | qeCIPipelines.defaults.networking.serviceNetwork[0] | string | `"172.30.0.0/16"` |  |
 | qeCIPipelines.defaults.ocp_versions[0] | string | `"4.20"` |  |
@@ -75,6 +87,17 @@ This chart is used to serve as the template for Validated Patterns Charts
 | qeCIPipelines.patterns.mcg.flavors.multi | string | `nil` |  |
 | qeCIPipelines.patterns.mcg.flavors.single.clusterGroup | string | `"standalone"` |  |
 | qeCIPipelines.patterns.mcg.repo | string | `"https://github.com/validatedpatterns/multicloud-gitops.git"` |  |
+| qeCIPipelines.patterns.ramen.awsCredsSecret | string | `"qe-ci-aws-creds"` |  |
+| qeCIPipelines.patterns.ramen.flavors.multi-dr.clusterGroup | string | `"odf"` |  |
+| qeCIPipelines.patterns.ramen.ocp_versions[0] | string | `"4.20"` |  |
+| qeCIPipelines.patterns.ramen.ocp_versions[1] | string | `"4.22"` |  |
+| qeCIPipelines.patterns.ramen.platforms.aws.spokePrimaryRegion | string | `"us-west-1"` |  |
+| qeCIPipelines.patterns.ramen.platforms.aws.spokeSecondaryRegion | string | `"us-east-2"` |  |
+| qeCIPipelines.patterns.ramen.repo | string | `"https://github.com/validatedpatterns/ramendr-starter-kit.git"` |  |
+| qeCIPipelines.patterns.ramen.revision | string | `"main"` |  |
+| qeCIPipelines.patterns.ramen.secrets[0] | string | `"ramendr-secret-values-file"` |  |
+| qeCIPipelines.patterns.ramen.spokePrimaryAcmName | string | `"ocp-primary"` |  |
+| qeCIPipelines.patterns.ramen.spokeSecondaryAcmName | string | `"ocp-secondary"` |  |
 | qeCIPipelines.scheduleDefaults.concurrencyPolicy | string | `"Forbid"` |  |
 | qeCIPipelines.scheduleDefaults.failedJobsHistoryLimit | int | `3` |  |
 | qeCIPipelines.scheduleDefaults.finallyTimeout | string | `"30m"` |  |

templates/pipelines/_pipeline-common.tpl

@@ -41,6 +41,33 @@ Install, optional spoke import, tests, and diagnostics (after provisioning).
 {{- $patternSecrets = append $patternSecrets (dict "name" $name "workspace" $workspace "index" $i) -}}
 {{- end -}}
 {{- end -}}
+{{- if eq .flavorName "multi-dr" }}
+- name: prepare-dr-secrets
+  runAfter:
+    - provision-hub
+    - provision-spoke-primary
+    - provision-spoke-secondary
+  taskRef:
+    name: prepare-dr-secrets
+  params:
+    - name: spoke-primary-cluster-name
+      value: $(tasks.provision-spoke-primary.results.cluster-name)
+    - name: spoke-secondary-cluster-name
+      value: $(tasks.provision-spoke-secondary.results.cluster-name)
+  workspaces:
+    - name: kubeconfig
+      workspace: shared-data
+      subPath: kubeconfig
+    - name: output
+      workspace: shared-data
+      subPath: prepared-values-secret
+    {{- range $i, $secret := $patternSecrets }}
+    {{- if eq $i 0 }}
+    - name: base-values-secret
+      workspace: {{ $secret.workspace }}
+    {{- end }}
+    {{- end }}
+{{- end }}
 - name: install-pattern
   onError: continue
   runAfter:
@@ -49,6 +76,8 @@ Install, optional spoke import, tests, and diagnostics (after provisioning).
     {{- else if eq .flavorName "multi" }}
     - provision-hub
     - provision-spoke
+    {{- else if eq .flavorName "multi-dr" }}
+    - prepare-dr-secrets
     {{- else }}
     - provision-hosted-cluster
     {{- end }}
@@ -58,7 +87,7 @@ Install, optional spoke import, tests, and diagnostics (after provisioning).
     {{- if eq .flavorName "single" }}
     - name: cluster-name
       value: $(tasks.provision-cluster.results.cluster-name)
-    {{- else if eq .flavorName "multi" }}
+    {{- else if or (eq .flavorName "multi") (eq .flavorName "multi-dr") }}
     - name: cluster-name
       value: $(tasks.provision-hub.results.cluster-name)
     {{- else }}
@@ -74,10 +103,16 @@ Install, optional spoke import, tests, and diagnostics (after provisioning).
     - name: kubeconfig
       workspace: shared-data
       subPath: kubeconfig
+    {{- if eq .flavorName "multi-dr" }}
+    - name: values-secret-0
+      workspace: shared-data
+      subPath: prepared-values-secret
+    {{- else }}
     {{- range $secret := $patternSecrets }}
     - name: values-secret-{{ $secret.index }}
       workspace: {{ $secret.workspace }}
     {{- end }}
+    {{- end }}
 {{- if eq .flavorName "multi" }}
 - name: import-spoke
   onError: continue
@@ -99,12 +134,30 @@ Install, optional spoke import, tests, and diagnostics (after provisioning).
     - name: kubeconfig
       workspace: shared-data
       subPath: kubeconfig
+{{- else if eq .flavorName "multi-dr" }}
+- name: wait-hub-dr
+  onError: continue
+  runAfter:
+    - install-pattern
+  taskRef:
+    name: wait-hub-dr
+  params:
+    - name: install-status
+      value: $(tasks.install-pattern.results.outcome)
+    - name: hub-cluster-name
+      value: $(tasks.provision-hub.results.cluster-name)
+  workspaces:
+    - name: kubeconfig
+      workspace: shared-data
+      subPath: kubeconfig
 {{- end }}
 - name: interop-test
   onError: continue
   runAfter:
     {{- if eq .flavorName "multi" }}
     - import-spoke
+    {{- else if eq .flavorName "multi-dr" }}
+    - wait-hub-dr
     {{- else }}
     - install-pattern
     {{- end }}
@@ -119,6 +172,13 @@ Install, optional spoke import, tests, and diagnostics (after provisioning).
       value: $(tasks.provision-hub.results.cluster-name)
     - name: spoke-cluster-name
       value: $(tasks.provision-spoke.results.cluster-name)
+    {{- else if eq .flavorName "multi-dr" }}
+    - name: hub-cluster-name
+      value: $(tasks.provision-hub.results.cluster-name)
+    - name: spoke-cluster-name
+      value: $(tasks.provision-spoke-primary.results.cluster-name)
+    - name: spoke-secondary-cluster-name
+      value: $(tasks.provision-spoke-secondary.results.cluster-name)
     {{- else }}
     - name: hub-cluster-name
       value: $(tasks.provision-hosted-cluster.results.cluster-name)
@@ -128,6 +188,8 @@ Install, optional spoke import, tests, and diagnostics (after provisioning).
     - name: install-status
     {{- if eq .flavorName "multi" }}
       value: $(tasks.import-spoke.results.import-status)
+    {{- else if eq .flavorName "multi-dr" }}
+      value: $(tasks.wait-hub-dr.results.outcome)
     {{- else }}
       value: $(tasks.install-pattern.results.outcome)
     {{- end }}
@@ -149,7 +211,7 @@ Install, optional spoke import, tests, and diagnostics (after provisioning).
     - name: cluster-name
     {{- if eq .flavorName "single" }}
       value: $(tasks.provision-cluster.results.cluster-name)
-    {{- else if eq .flavorName "multi" }}
+    {{- else if or (eq .flavorName "multi") (eq .flavorName "multi-dr") }}
       value: $(tasks.provision-hub.results.cluster-name)
     {{- else }}
       value: $(tasks.provision-hosted-cluster.results.cluster-name)
@@ -179,12 +241,50 @@ Install, optional spoke import, tests, and diagnostics (after provisioning).
     - name: must-gather
       workspace: shared-data
       subPath: must-gather
+{{- else if eq .flavorName "multi-dr" }}
+- name: must-gather-spoke-primary
+  runAfter:
+    - interop-test
+  when:
+    - cel: "'$(tasks.install-pattern.results.outcome)' == 'failed' || '$(tasks.interop-test.results.outcome)' == 'failed'"
+  taskRef:
+    name: must-gather
+  params:
+    - name: cluster-name
+      value: $(tasks.provision-spoke-primary.results.cluster-name)
+  workspaces:
+    - name: kubeconfig
+      workspace: shared-data
+      subPath: kubeconfig
+    - name: must-gather
+      workspace: shared-data
+      subPath: must-gather
+- name: must-gather-spoke-secondary
+  runAfter:
+    - interop-test
+  when:
+    - cel: "'$(tasks.install-pattern.results.outcome)' == 'failed' || '$(tasks.interop-test.results.outcome)' == 'failed'"
+  taskRef:
+    name: must-gather
+  params:
+    - name: cluster-name
+      value: $(tasks.provision-spoke-secondary.results.cluster-name)
+  workspaces:
+    - name: kubeconfig
+      workspace: shared-data
+      subPath: kubeconfig
+    - name: must-gather
+      workspace: shared-data
+      subPath: must-gather
 {{- end }}
 - name: upload-must-gather
   runAfter:
     - must-gather-hub
 {{- if eq .flavorName "multi" }}
     - must-gather-spoke
+{{- else if eq .flavorName "multi-dr" }}
+    - must-gather-spoke-primary
+    - must-gather-spoke-secondary
 {{- end }}
   when:
     - input: $(tasks.must-gather-hub.results.outcome)
@@ -194,6 +294,13 @@ Install, optional spoke import, tests, and diagnostics (after provisioning).
     - input: $(tasks.must-gather-spoke.results.outcome)
       operator: in
       values: ["success"]
+{{- else if eq .flavorName "multi-dr" }}
+    - input: $(tasks.must-gather-spoke-primary.results.outcome)
+      operator: in
+      values: ["success"]
+    - input: $(tasks.must-gather-spoke-secondary.results.outcome)
+      operator: in
+      values: ["success"]
 {{- end }}
   taskRef:
     name: upload-must-gather
@@ -241,7 +348,7 @@ Shared finally tasks (not flavor-specific cleanup).
     - name: exact-ocp-version
     {{- if eq .flavorName "single" }}
       value: $(tasks.provision-cluster.results.exact-ocp-version)
-    {{- else if eq .flavorName "multi" }}
+    {{- else if or (eq .flavorName "multi") (eq .flavorName "multi-dr") }}
       value: $(tasks.provision-hub.results.exact-ocp-version)
     {{- else }}
       value: $(tasks.provision-hosted-cluster.results.exact-ocp-version)