From cb9a204a982678cf30bff666788b4b7ee0d7cdb2 Mon Sep 17 00:00:00 2001
From: "daniel.zatovic" <daniel.zatovic@gmail.com>
Date: Thu, 20 Jan 2022 14:21:28 +0100
Subject: [PATCH] Remove merge jobs and RHEL 9 FIPS package updates.

---
 .gitlab/ci/annocheck.yml | 17 ---------
 .gitlab/ci/csmock.yml    | 16 --------
 .gitlab/ci/rhel.yml      | 81 +---------------------------------------
 3 files changed, 2 insertions(+), 112 deletions(-)

diff --git a/.gitlab/ci/annocheck.yml b/.gitlab/ci/annocheck.yml
index cf94dd49..ea6fa02f 100644
--- a/.gitlab/ci/annocheck.yml
+++ b/.gitlab/ci/annocheck.yml
@@ -13,20 +13,3 @@ test-main-commit-job-annocheck:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
   script:
     - /opt/csmock-run-script.sh
-
-test-mergerq-job-annocheck:
-  tags:
-    - libvirt
-    - rhel9-annocheck
-  stage: test
-  interruptible: true
-  allow_failure: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-  script:
-    - /opt/build-rpm-script.sh > /dev/null 2>&1
-    - annocheck /var/lib/mock/rhel-9.0.0-candidate-x86_64/result/*.rpm
diff --git a/.gitlab/ci/csmock.yml b/.gitlab/ci/csmock.yml
index 67f930c5..3f7c9d76 100644
--- a/.gitlab/ci/csmock.yml
+++ b/.gitlab/ci/csmock.yml
@@ -13,19 +13,3 @@ test-main-commit-job-csmock:
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
   script:
     - /opt/csmock-run-script.sh
-
-test-mergerq-job-csmock:
-  tags:
-    - libvirt
-    - rhel7-csmock
-  stage: test
-  interruptible: true
-  allow_failure: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-  script:
-    - /opt/csmock-run-script.sh  > /dev/null 2>&1
diff --git a/.gitlab/ci/rhel.yml b/.gitlab/ci/rhel.yml
index bcaf1e11..240859d0 100644
--- a/.gitlab/ci/rhel.yml
+++ b/.gitlab/ci/rhel.yml
@@ -33,25 +33,6 @@ test-main-commit-rhel8:
     - make -j -C tests check-programs
     - sudo -E make check
 
-test-mergerq-rhel8:
-  extends:
-    - .rhel-openssl-backend
-  tags:
-    - libvirt
-    - rhel8
-  stage: test
-  interruptible: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-  script:
-    - make -j
-    - make -j -C tests check-programs
-    - sudo -E make check
-
 test-main-commit-rhel9:
   extends:
     - .rhel-openssl-backend
@@ -71,25 +52,6 @@ test-main-commit-rhel9:
     - make -j -C tests check-programs
     - sudo -E make check
 
-test-mergerq-rhel9:
-  extends:
-    - .rhel-openssl-backend
-  tags:
-    - libvirt
-    - rhel9
-  stage: test
-  interruptible: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-  script:
-    - make -j
-    - make -j -C tests check-programs
-    - sudo -E make check
-
 # FIPS jobs
 
 test-main-commit-rhel8-fips:
@@ -111,28 +73,7 @@ test-main-commit-rhel8-fips:
     - make -j -C tests check-programs
     - sudo -E make check
 
-test-mergerq-rhel8-fips:
-  extends:
-    - .rhel-openssl-backend
-  tags:
-    - libvirt
-    - rhel8-fips
-  stage: test
-  interruptible: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-  script:
-    - make -j
-    - make -j -C tests check-programs
-    - sudo -E make check
-
 test-main-commit-rhel9-fips:
-  extends:
-    - .rhel-openssl-backend
   tags:
     - libvirt
     - rhel9-fips
@@ -146,26 +87,8 @@ test-main-commit-rhel9-fips:
       when: never
     - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH || $CI_COMMIT_BRANCH =~ /v2\..\.x$/
   script:
-    - make -j
-    - make -j -C tests check-programs
-    - sudo -E make check
-
-test-mergerq-rhel9-fips:
-  extends:
-    - .rhel-openssl-backend
-  tags:
-    - libvirt
-    - rhel9-fips
-  stage: test
-  interruptible: true
-  allow_failure: true
-  variables:
-    RUN_SSH_PLUGIN_TEST: "1"
-  rules:
-    - if: $CI_PROJECT_PATH != "cryptsetup/cryptsetup"
-      when: never
-    - if: $CI_PIPELINE_SOURCE == "merge_request_event"
-  script:
+    - ./autogen.sh
+    - ./configure --enable-fips --enable-pwquality --with-crypto_backend=openssl
     - make -j
     - make -j -C tests check-programs
     - sudo -E make check