sync from upstream script update

prepopulate.json

@@ -27458,8 +27458,8 @@
         "realmd.aarch64"
       ],
       "rocky-release": [
-        "rocky-release-eula.aarch64",
-        "rocky-release.aarch64"
+        "rocky-release-eula.noarch",
+        "rocky-release.noarch"
       ],
       "restore": [
         "restore.aarch64"
@@ -29038,8 +29038,8 @@
         "realmd.ppc64le"
       ],
       "rocky-release": [
-        "rocky-release-eula.ppc64le",
-        "rocky-release.ppc64le"
+        "rocky-release-eula.noarch",
+        "rocky-release.noarch"
       ],
       "restore": [
         "restore.ppc64le"
@@ -30562,8 +30562,8 @@
         "realmd.s390x"
       ],
       "rocky-release": [
-        "rocky-release-eula.s390x",
-        "rocky-release.s390x"
+        "rocky-release-eula.noarch",
+        "rocky-release.noarch"
       ],
       "restore": [
         "restore.s390x"
@@ -32152,8 +32152,8 @@
         "realmd.x86_64"
       ],
       "rocky-release": [
-        "rocky-release-eula.x86_64",
-        "rocky-release.x86_64"
+        "rocky-release-eula.noarch",
+        "rocky-release.noarch"
       ],
       "restore": [
         "restore.x86_64"

sync-from-upstream

@@ -1,20 +1,34 @@
 #!/bin/bash
-HOWMANY="-$1"
-if [ -z $1 ]; then
-  HOWMANY="-1"
+set -e
+echo "Cloning upstream pungi"
+git clone https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos.git -b centos-10-stream /var/tmp/c10s
+
+echo "Copying shared data"
+if [ -d "shared" ]; then
+  /bin/cp /var/tmp/c10s/shared/* shared/
 fi
 
-BRANCH=$(git branch --show-current)
-if [[ ! "${BRANCH}" =~ "r10s" ]]; then
-  echo "Not a lookahead branch."
-  exit 1
-fi
+echo "Copying prepopulate"
+/bin/cp /var/tmp/c10s/prepopulate.json .
 
-echo "Fetching from upstream"
-git fetch https://gitlab.com/redhat/centos-stream/release-engineering/pungi-centos.git centos-10-stream
-echo "Formatting patch and applying..."
-git format-patch --stdout ${HOWMANY} FETCH_HEAD | sed -e 's|centos/|rocky/|' | git apply
-echo "!! DIFF OF CHANGES !!"
-git --no-pager diff HEAD
+echo "Changing to rocky where required in prepopulate"
+while read -r pattern; do
+  sscript+="$pattern;"
+done <<EOF
+s/"redhat-release"/"rocky-release"/g
+s/"redhat-release\..*"/"rocky-release.noarch"/g
+s/"redhat-release-eula\..*"/"rocky-release-eula.noarch"/g
+s/"redhat-indexhtml/"rocky-indexhtml/g
+s/"redhat-logos/"rocky-logos/g
+s/"redhat-backgrounds/"rocky-backgrounds/g
+s/"redhat-sb-certs/"rocky-sb-certs/g
+EOF
+sed -ie "$sscript" prepopulate.json
 
-echo "You may now commit and push."
+echo "Generating yaml"
+/bin/bash ./generate-prepop-yaml
+
+rm -rf /var/tmp/c10s
+
+git status
+echo "Completed. Check status above."