From aa69df07e6ce0ad4e7eb92a3b027e2fbaf1fdda6 Mon Sep 17 00:00:00 2001
From: Andrea Hoffer <ahoffer@redhat.com>
Date: Mon, 15 Jan 2024 13:06:54 -0500
Subject: [PATCH 1/2] Merge rights exercise 2: Travis build failures

---
 .../backing-up-etcd.adoc                      |  7 ++++++
 modules/test-module-1.adoc                    | 25 +++++++++++++++++++
 modules/test-module-2.adoc                    | 18 +++++++++++++
 3 files changed, 50 insertions(+)
 create mode 100644 modules/test-module-1.adoc
 create mode 100644 modules/test-module-2.adoc

diff --git a/backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc b/backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc
index 1a923af0f4d6..08574947f725 100644
--- a/backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc
+++ b/backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc
@@ -21,3 +21,10 @@ After you have an etcd backup, you can xref:../../backup_and_restore/control_pla
 
 // Backing up etcd data
 include::modules/backup-etcd.adoc[leveloffset=+1]
+
+include::modules/test-module-1.adoc[leveloffset=+1]
+
+include::modules/test-module-2.adoc[leveloffset=+1]
+
+.Additional resources
+* xref:../../welcome/index-page.adoc#welcome-index[Welcome page]
diff --git a/modules/test-module-1.adoc b/modules/test-module-1.adoc
new file mode 100644
index 000000000000..b5a274f2e05d
--- /dev/null
+++ b/modules/test-module-1.adoc
@@ -0,0 +1,25 @@
+// Module included in the following assemblies:
+//
+// * backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc
+
+[id="test-module-1_{context}]
+= Test module 1
+
+This is my test module.
+
+.Procedure
+
+. Test command 1
++
+[source,terminal]
+----
+$ oc version
+----
+
+. Test command 2
++
+[source,terminal]
+----
+$ oc help
+
+This is the end.
diff --git a/modules/test-module-2.adoc b/modules/test-module-2.adoc
new file mode 100644
index 000000000000..a448c6eb3916
--- /dev/null
+++ b/modules/test-module-2.adoc
@@ -0,0 +1,18 @@
+
+// Module included in the following assemblies:
+//
+// * backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc
+
+[id="test-module-1_{context}"]
+= Test module 2
+
+This is my test module.
+
+.Procedure
+
+. Test command
++
+[source,terminal]
+----
+$ oc whoami
+----

From adf933a5fad755437e28013152f2ab1e0eec81e9 Mon Sep 17 00:00:00 2001
From: Tami Love <tlove@redhat.com>
Date: Fri, 17 May 2024 15:25:40 -0400
Subject: [PATCH 2/2] fix ID

---
 modules/test-module-2.adoc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/test-module-2.adoc b/modules/test-module-2.adoc
index a448c6eb3916..316b975af30f 100644
--- a/modules/test-module-2.adoc
+++ b/modules/test-module-2.adoc
@@ -3,7 +3,7 @@
 //
 // * backup_and_restore/control_plane_backup_and_restore/backing-up-etcd.adoc
 
-[id="test-module-1_{context}"]
+[id="test-module-2_{context}"]
 = Test module 2
 
 This is my test module.