From 5f6007ba0ffe711a049b3753628ff1d171c08ea9 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Thu, 16 May 2024 00:48:34 -0700
Subject: [PATCH] sync from upstream

---
 .gitlab-ci.yml                             | 24 ++++++++++++++++++++++
 shared/additional_and_filter_packages.conf |  6 ++++++
 2 files changed, 30 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..b4e9b85
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,24 @@
+variables:
+  DOWNSTREAM_BRANCH: "rhel-10.0-beta"
+
+default:
+  image: images.paas.redhat.com/osci/compose-utils:latest
+
+push-to-rhel:
+  tags:
+    - docker
+  rules:
+    - if: $CI_PROJECT_ID == "24620603" && $CI_MERGE_REQUEST_EVENT_TYPE == "merge_train" && $CI_COMMIT_BRANCH == "centos-10-stream"
+  script:
+    - echo "Trying to sync to new rhel"
+    - git remote add rhel_origin https://@gitlab.cee.redhat.com/rhel/release-engineering/pungi-redhat.git
+    - git fetch rhel_origin $DOWNSTREAM_BRANCH
+    - git fetch origin centos-10-stream
+    - ref=$(git rev-parse origin/centos-10-stream)
+    - git checkout rhel_origin/$DOWNSTREAM_BRANCH; git checkout -b update-$ref rhel_origin/$DOWNSTREAM_BRANCH
+    - "[[ $CI_COMMIT_SHA != $(git rev-parse origin/centos-10-stream) ]] && echo \"Pipeline doesn't have the latest revision of centos-10-stream branch, skipping\" && exit 1"
+    - merge_diff=`git merge-tree $(git merge-base rhel_origin/$DOWNSTREAM_BRANCH origin/centos-10-stream) rhel_origin/$DOWNSTREAM_BRANCH origin/centos-10-stream`
+    - echo "$merge_diff"
+    - git merge -m "Sync from centos - HEAD at $CI_COMMIT_MESSAGE" origin/centos-10-stream
+    - git push "https://gitlab-sync-token:$ACCESS_TOKEN_PUNGI@gitlab.cee.redhat.com/rhel/release-engineering/pungi-redhat.git" update-$ref -o merge_request.create -o merge_request.target=$DOWNSTREAM_BRANCH -o merge_request.merge_when_pipeline_succeeds
+    - while true; do if [ "$(curl -s https://gitlab.cee.redhat.com/api/v4/projects/83087/pipelines?sha=$ref | jq -r '.[0].status')" == "passed" ]; then echo "Downstream pipeline passed" && break; fi; done
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 1b7518d..ff06b76 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -82,6 +82,9 @@ additional_packages = [
             "kernel-modules-core", #ENGCMP-2899
             "kernel-debug-modules-core", #ENGCMP-2899
             "kpatch", #ENGCMP-3983
+            "dhcpcd", #ENGCMP-3945
+            "kdump-utils", #ENGCMP-4007
+            "makedumpfile", #ENGCMP-4007
         ]
     }),
     ("^BaseOS$", {
@@ -404,6 +407,9 @@ additional_packages = [
             "libgit2", #ENGCMP-3966
             "gnome-shell-extension-light-style", #ENGCMP-3979
             "gnome-shell-extension-system-monitor", #ENGCMP-3979
+            "ansible-collection-microsoft-sql", #ENGCMP-4021
+            "insights-client-ros", #ENGCMP-3824
+            "rubygem-racc", #ENGCMP-4018
         ]
     }),
     ("^AppStream$", {