Remove duplicate test scripts

dogtagpki · Oct 29, 2024 · 250c347 · 250c347
1 parent 9785b3f
commit 250c347
Show file tree

Hide file tree

Showing 12 changed files with 142 additions and 236 deletions.
diff --git a/.github/workflows/ca-clone-ssnv1-test.yml b/.github/workflows/ca-clone-ssnv1-test.yml
@@ -165,7 +165,7 @@ jobs:
 
       - name: Check request range objects
         run: |
-          tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-request-range-objects.sh primaryds | tee output
 
           # since the remaining numbers in the current range are below
           # the minimum, a new request range was allocated
@@ -181,15 +181,15 @@ jobs:
 
       - name: Check cert range objects
         run: |
-         tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds | tee output
+         tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output
 
           # since the remaining numbers in the current range are not
           # less than the minimum, no new cert range was allocated
           diff /dev/null output
 
       - name: Check request next range
         run: |
-          tests/ca/bin/ca-request-next-range-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-request-next-range.sh primaryds | tee output
 
           # since there's an allocated request range, the nextRange
           # should be endRange + 1 which is 21 decimal
@@ -201,7 +201,7 @@ jobs:
 
       - name: Check cert next range
         run: |
-          tests/ca/bin/ca-cert-next-range-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-cert-next-range.sh primaryds | tee output
 
           # since there's no allocated cert range, the nextRange should be
           # dbs.endSerialNumber + 1 which is 13 hex (19 decimal), but due
@@ -374,7 +374,7 @@ jobs:
 
       - name: Check request range objects
         run: |
-          tests/ca/bin/ca-request-range-objects-ssnv1.sh secondaryds | tee output
+          tests/ca/bin/ca-request-range-objects.sh secondaryds | tee output
 
           # request range should be the same
           # NOTE: there's no indication that half of the range has
@@ -391,14 +391,14 @@ jobs:
 
       - name: Check cert range objects
         run: |
-          tests/ca/bin/ca-cert-range-objects-ssnv1.sh secondaryds | tee output
+          tests/ca/bin/ca-cert-range-objects.sh secondaryds | tee output
 
           # cert range should be the same
           diff /dev/null output
 
       - name: Check request next range
         run: |
-          tests/ca/bin/ca-request-next-range-ssnv1.sh secondaryds | tee output
+          tests/ca/bin/ca-request-next-range.sh secondaryds | tee output
 
           # request nextRange should be the same
           cat > expected << EOF
@@ -409,7 +409,7 @@ jobs:
 
       - name: Check cert next range
         run: |
-          tests/ca/bin/ca-cert-next-range-ssnv1.sh secondaryds | tee output
+          tests/ca/bin/ca-cert-next-range.sh secondaryds | tee output
 
           # cert nextRange should be the same
           cat > expected << EOF
@@ -550,7 +550,7 @@ jobs:
 
       - name: Check request range objects
         run: |
-          tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-request-range-objects.sh primaryds | tee output
 
           # request range should be the same
           cat > expected << EOF
@@ -565,14 +565,14 @@ jobs:
 
       - name: Check cert range objects
         run: |
-          tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output
 
           # cert range should be the same
           diff /dev/null output
 
       - name: Check request next range
         run: |
-          tests/ca/bin/ca-request-next-range-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-request-next-range.sh primaryds | tee output
 
           # request nextRange should be the same
           cat > expected << EOF
@@ -583,7 +583,7 @@ jobs:
 
       - name: Check cert next range
         run: |
-          tests/ca/bin/ca-cert-next-range-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-cert-next-range.sh primaryds | tee output
 
           # cert nextRange should be the same
           cat > expected << EOF
@@ -740,7 +740,7 @@ jobs:
 
       - name: Check request range objects
         run: |
-          tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-request-range-objects.sh primaryds | tee output
 
           # since the remaining numbers are below the minimum in the
           # secondary CA, a new cert request should be allocated for it
@@ -761,7 +761,7 @@ jobs:
 
       - name: Check cert range objects
         run: |
-          tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output
 
           # since the remaining numbers are below the minimum in both primary
           # and secondary CA, new cert ranges should be allocated for them
@@ -782,7 +782,7 @@ jobs:
 
       - name: Check request next range
         run: |
-          tests/ca/bin/ca-request-next-range-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-request-next-range.sh primaryds | tee output
 
           # request nextRange should be 31 decimal
           cat > expected << EOF
@@ -793,7 +793,7 @@ jobs:
 
       - name: Check cert next range
         run: |
-          tests/ca/bin/ca-cert-next-range-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-cert-next-range.sh primaryds | tee output
 
           # cert nextRange should be 49 decimal
           cat > expected << EOF
@@ -931,7 +931,7 @@ jobs:
 
       - name: Check request range objects
         run: |
-          tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-request-range-objects.sh primaryds | tee output
 
           # request ranges should remain the same
           cat > expected << EOF
@@ -951,7 +951,7 @@ jobs:
 
       - name: Check cert range objects
         run: |
-          tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output
 
           # cert ranges should remain the same
           cat > expected << EOF
@@ -971,7 +971,7 @@ jobs:
 
       - name: Check request next range
         run: |
-          tests/ca/bin/ca-request-next-range-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-request-next-range.sh primaryds | tee output
 
           # request nextRange should remain the same
           cat > expected << EOF
@@ -982,7 +982,7 @@ jobs:
 
       - name: Check cert next range
         run: |
-          tests/ca/bin/ca-cert-next-range-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-cert-next-range.sh primaryds | tee output
 
           # cert nextRange should remain the same
           cat > expected << EOF
@@ -1008,7 +1008,7 @@ jobs:
 
       - name: Check old request range objects
         run: |
-          tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-request-range-objects.sh primaryds | tee output
 
           # request ranges should remain the same
           cat > expected << EOF
@@ -1028,7 +1028,7 @@ jobs:
 
       - name: Check new request range objects
         run: |
-          tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds ou=requests,ou=ranges_v2 | tee output
+          tests/ca/bin/ca-request-range-objects.sh primaryds ou=requests,ou=ranges_v2 | tee output
 
           # request ranges should remain the same
           cat > expected << EOF
@@ -1043,7 +1043,7 @@ jobs:
 
       - name: Check request next range
         run: |
-          tests/ca/bin/ca-request-next-range-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-request-next-range.sh primaryds | tee output
 
           # request nextRange should remain the same
           cat > expected << EOF
@@ -1054,7 +1054,7 @@ jobs:
 
       - name: Check old cert range objects
         run: |
-          tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output
 
           # cert ranges should remain the same but converted from hex to decimal
           # the range value for the primary move from 13-30 (hex) to 19-48 (dec) 
@@ -1075,7 +1075,7 @@ jobs:
 
       - name: Check new cert range objects
         run: |
-          tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds ou=certificateRepository,ou=ranges_v2 | tee output
+          tests/ca/bin/ca-cert-range-objects.sh primaryds ou=certificateRepository,ou=ranges_v2 | tee output
 
           # cert ranges should remain the same but converted from hex to decimal
           # the range value for the primary move from 13-30 (hex) to 19-48 (dec) 
@@ -1091,7 +1091,7 @@ jobs:
 
       - name: Check cert next range
         run: |
-          tests/ca/bin/ca-cert-next-range-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-cert-next-range.sh primaryds | tee output
 
           # cert nextRange should remain the same
           cat > expected << EOF
@@ -1204,7 +1204,7 @@ jobs:
 
       - name: Check old request range objects
         run: |
-          tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-request-range-objects.sh primaryds | tee output
 
           cat > expected << EOF
           SecurePort: 8443
@@ -1223,7 +1223,7 @@ jobs:
 
       - name: Check new request range objects
         run: |
-          tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds ou=requests,ou=ranges_v2 | tee output
+          tests/ca/bin/ca-request-range-objects.sh primaryds ou=requests,ou=ranges_v2 | tee output
 
           cat > expected << EOF
           SecurePort: 8443
@@ -1252,7 +1252,7 @@ jobs:
 
       - name: Check old cert range objects
         run: |
-          tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output
 
           # cert ranges should remain the same
           cat > expected << EOF
@@ -1272,7 +1272,7 @@ jobs:
 
       - name: Check new cert range objects
         run: |
-          tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds ou=certificateRepository,ou=ranges_v2 | tee output
+          tests/ca/bin/ca-cert-range-objects.sh primaryds ou=certificateRepository,ou=ranges_v2 | tee output
 
           # cert ranges should remain the same but in dec.
           # the range value for the primary move from 13-30 (hex) to 19-48 (dec)
@@ -1294,7 +1294,7 @@ jobs:
 
       - name: Check request repository
         run: |
-          tests/ca/bin/ca-request-next-range-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-request-next-range.sh primaryds | tee output
 
           cat > expected << EOF
           nextRange: 51
@@ -1304,7 +1304,7 @@ jobs:
 
       - name: Check cert repository
         run: |
-          tests/ca/bin/ca-cert-next-range-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-cert-next-range.sh primaryds | tee output
 
           cat > expected << EOF
           nextRange: 73
@@ -1483,7 +1483,7 @@ jobs:
 
       - name: Check old request range objects
         run: |
-          tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-request-range-objects.sh primaryds | tee output
 
           cat > expected << EOF
           SecurePort: 8443
@@ -1502,7 +1502,7 @@ jobs:
 
       - name: Check new request range objects
         run: |
-          tests/ca/bin/ca-request-range-objects-ssnv1.sh primaryds ou=requests,ou=ranges_v2 | tee output
+          tests/ca/bin/ca-request-range-objects.sh primaryds ou=requests,ou=ranges_v2 | tee output
 
           cat > expected << EOF
           SecurePort: 8443
@@ -1556,7 +1556,7 @@ jobs:
 
       - name: Check old cert range objects
         run: |
-          tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-cert-range-objects.sh primaryds | tee output
 
           # cert ranges should remain the same
           cat > expected << EOF
@@ -1576,7 +1576,7 @@ jobs:
 
       - name: Check new cert range objects
         run: |
-          tests/ca/bin/ca-cert-range-objects-ssnv1.sh primaryds ou=certificateRepository,ou=ranges_v2 | tee output
+          tests/ca/bin/ca-cert-range-objects.sh primaryds ou=certificateRepository,ou=ranges_v2 | tee output
 
           cat > expected << EOF
           SecurePort: 8443
@@ -1610,7 +1610,7 @@ jobs:
 
       - name: Check request repository
         run: |
-          tests/ca/bin/ca-request-next-range-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-request-next-range.sh primaryds | tee output
 
           cat > expected << EOF
           nextRange: 101
@@ -1620,7 +1620,7 @@ jobs:
 
       - name: Check cert repository
         run: |
-          tests/ca/bin/ca-cert-next-range-ssnv1.sh primaryds | tee output
+          tests/ca/bin/ca-cert-next-range.sh primaryds | tee output
 
           cat > expected << EOF
           nextRange: 127