#846 Use compose-create-legacy-composeinfo to generate .composeinfo file
Closed 2 years ago by mohanboddu. Opened 3 years ago by mohanboddu.
mohanboddu/pungi-fedora legacy-composeinfo  into  main

file modified
+12 -3
@@ -114,6 +114,9 @@ 

  ./releng/scripts/critpath.py --url file://$DESTDIR/compose/Everything/ -o $DESTDIR/logs/critpath.txt rawhide &> $DESTDIR/logs/critpath.log

  }

  

+ # Generate the .composeinfo file - https://pagure.io/pungi-fedora/issue/738

+ compose-create-legacy-composeinfo "$DESTDIR/compose/" -p "$DESTDIR/compose/"

+ 

  # Tell interested persons that the rsync is starting (zomg!)

  send_fedora_message "${fedora_message_json_start}" ${RELEASE} rsync.start

  
@@ -148,7 +151,9 @@ 

      --link-dest="$RSYNCTARGET/Everything" --delete-after

  

  $RSYNCPREFIX rm "$RSYNCTARGET/.composeinfo"

- $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"

+ # Sync the .composeinfo file

+ $RSYNCPREFIX rsync -avhHP "$DESTDIR/compose/.composeinfo" "$RSYNCTARGET/"

+ # $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCTARGET/" --name "$NEWCOMPOSE_ID"

  

  # hardlink content (this will hardlink aarch64 with the other arches)

  time hardlink -v "$RSYNCTARGET/.."
@@ -167,7 +172,9 @@ 

      --variant Labs \

      --link-dest="$RSYNCTARGET/Everything/" --delete-after

  $RSYNCPREFIX rm "$RSYNCALTTARGET/.composeinfo"

- $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCALTTARGET/" --name "$NEWCOMPOSE_ID"

+ # Sync the .composeinfo file

+ $RSYNCPREFIX rsync -avhHP "$DESTDIR/compose/.composeinfo" "$RSYNCALTTARGET/"

+ # $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCALTTARGET/" --name "$NEWCOMPOSE_ID"

  

  # hardlink content (this will hardlink aarch64 with the other arches)

  time hardlink -v "$RSYNCTARGET/.."
@@ -189,7 +196,9 @@ 

      --link-dest="$RSYNCTARGET/Everything/" --link-dest="$RSYNCSECTARGET/Everything/" --delete-after

  

  $RSYNCPREFIX rm "$RSYNCSECTARGET/.composeinfo"

- $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"

+ # Sync the .composeinfo file

+ $RSYNCPREFIX rsync -avhHP "$DESTDIR/compose/.composeinfo" "$RSYNCSECTARGET/"

+ # $RSYNCPREFIX ./releng/scripts/build_composeinfo "$RSYNCSECTARGET/" --name "$NEWCOMPOSE_ID"

  

  # hardlink content (this will hardlink ppc64le/s390x)

  time hardlink -v "$RSYNCSECTARGET/.."

This is for nightly run rawhide compose

Signed-off-by: Mohan Boddu mboddu@bhujji.com

The -p is not needed here, the default is the same location. But it doesn't hurt anything.

I believe this should generate .composeinfo that Beaker can consume.

Dont merge this yet as we need to make some changes to this.

Any news on the changes here?

@mohanboddu what changes are required to this PR? Also could you please rebase it?

rebased onto b160c34

2 years ago

Closing this one for now.

Pull-Request has been closed by mohanboddu

2 years ago
Metadata