From 4fb546b14008c76595d49e8c0768251989b58004 Mon Sep 17 00:00:00 2001
From: Marco Fargetta <mfargett@redhat.com>
Date: Fri, 18 Oct 2024 17:06:02 +0200
Subject: [PATCH] Update sequential tests to the new generator update command

---
 .../workflows/ca-clone-sequential-test.yml    | 47 +++++++++++++++----
 .github/workflows/ca-sequential-test.yml      | 18 +++----
 2 files changed, 48 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ca-clone-sequential-test.yml b/.github/workflows/ca-clone-sequential-test.yml
index df09ccfd30f..61b53f41136 100644
--- a/.github/workflows/ca-clone-sequential-test.yml
+++ b/.github/workflows/ca-clone-sequential-test.yml
@@ -996,6 +996,37 @@ jobs:
           docker exec primary pki-server ca-range-generator-update --type cert legacy2
           docker exec primary pki-server start --wait
 
+      - name: Check cert range objects
+        run: |
+          tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output
+
+          # cert ranges should remain the same
+          cat > expected << EOF
+          SecurePort: 8443
+          beginRange: 31
+          endRange: 48
+          host: secondary.example.com
+
+          SecurePort: 8443
+          beginRange: 19
+          endRange: 48
+          host: primary.example.com
+
+          EOF
+
+          diff expected output
+
+      - name: Check cert next range
+        run: |
+          tests/ca/bin/ca-cert-next-range.sh primaryds | tee output
+
+          # cert nextRange should remain the same
+          cat > expected << EOF
+          nextRange: 49
+          EOF
+
+          diff expected output
+
       - name: Switch secondary to legacy2
         run: |
           docker exec secondary pki-server stop
@@ -1095,13 +1126,13 @@ jobs:
           # cert ranges should remain the same
           cat > expected << EOF
           SecurePort: 8443
-          beginRange: 13
-          endRange: 30
+          beginRange: 19
+          endRange: 48
           host: primary.example.com
 
           SecurePort: 8443
-          beginRange: 31
-          endRange: 48
+          beginRange: 49
+          endRange: 72
           host: secondary.example.com
 
           EOF
@@ -1349,13 +1380,13 @@ jobs:
 
           cat > expected << EOF
           SecurePort: 8443
-          beginRange: 13
-          endRange: 30
+          beginRange: 19
+          endRange: 48
           host: primary.example.com
 
           SecurePort: 8443
-          beginRange: 31
-          endRange: 48
+          beginRange: 49
+          endRange: 72
           host: secondary.example.com
 
           SecurePort: 8443
diff --git a/.github/workflows/ca-sequential-test.yml b/.github/workflows/ca-sequential-test.yml
index 6c94270d9ae..fd55f188a70 100644
--- a/.github/workflows/ca-sequential-test.yml
+++ b/.github/workflows/ca-sequential-test.yml
@@ -1200,7 +1200,7 @@ jobs:
           tests/ca/bin/ca-cert-next-range.sh ds | tee output
 
           cat > expected << EOF
-          nextRange: 55
+          nextRange: 85
           EOF
 
           diff expected output
@@ -1242,13 +1242,13 @@ jobs:
           # new cert range should be 27 - 42 decimal (total: 16)
           cat > expected << EOF
           SecurePort: 8443
-          beginRange: 19
-          endRange: 36
+          beginRange: 25
+          endRange: 54
           host: pki.example.com
 
           SecurePort: 8443
-          beginRange: 37
-          endRange: 54
+          beginRange: 55
+          endRange: 84
           host: pki.example.com
 
           EOF
@@ -1430,13 +1430,13 @@ jobs:
 
           cat > expected << EOF
           SecurePort: 8443
-          beginRange: 19
-          endRange: 36
+          beginRange: 25
+          endRange: 54
           host: pki.example.com
 
           SecurePort: 8443
-          beginRange: 37
-          endRange: 54
+          beginRange: 55
+          endRange: 84
           host: pki.example.com
 
           SecurePort: 8443