Re: [PATCH for-4.20] automation: Use a different ImageBuilder repository URL

[Stefano Stabellini <sstabellini@xxxxxxxxxx>]

On Tue, 9 Jul 2024, Alejandro Vallejo wrote:
> On Tue Jul 9, 2024 at 1:21 PM BST, Michal Orzel wrote:
> > Switch to using https://gitlab.com/xen-project/imagebuilder.git which
> > should be considered official ImageBuilder repo.
> >
> > Signed-off-by: Michal Orzel <michal.orzel@xxxxxxx>
> > ---
> >  automation/scripts/qemu-smoke-dom0-arm32.sh       | 2 +-
> >  automation/scripts/qemu-smoke-dom0-arm64.sh       | 2 +-
> >  automation/scripts/qemu-smoke-dom0less-arm32.sh   | 2 +-
> >  automation/scripts/qemu-smoke-dom0less-arm64.sh   | 2 +-
> >  automation/scripts/qemu-xtf-dom0less-arm64.sh     | 2 +-
> >  automation/scripts/xilinx-smoke-dom0less-arm64.sh | 2 +-
> >  6 files changed, 6 insertions(+), 6 deletions(-)
> >
> > diff --git a/automation/scripts/qemu-smoke-dom0-arm32.sh 
> > b/automation/scripts/qemu-smoke-dom0-arm32.sh
> > index d91648905669..5b62e3f691f1 100755
> > --- a/automation/scripts/qemu-smoke-dom0-arm32.sh
> > +++ b/automation/scripts/qemu-smoke-dom0-arm32.sh
> > @@ -73,7 +73,7 @@ UBOOT_SOURCE="boot.source"
> >  UBOOT_SCRIPT="boot.scr"' > config
> >  
> >  rm -rf imagebuilder
> > -git clone https://gitlab.com/ViryaOS/imagebuilder
> > +git clone https://gitlab.com/xen-project/imagebuilder.git
> 
> For this clone and all others:
> 
> You probably want "git clone --depth 1 <url>" to pull the tip of the repo and
> not its history.

That's a good idea. You can add my

Reviewed-by: Stefano Stabellini <sstabellini@xxxxxxxxxx>


> >  bash imagebuilder/scripts/uboot-script-gen -t tftp -d . -c config
> >  
> >  rm -f ${serial_log}
> > diff --git a/automation/scripts/qemu-smoke-dom0-arm64.sh 
> > b/automation/scripts/qemu-smoke-dom0-arm64.sh
> > index e0bb37af3610..ca59bdec1b2b 100755
> > --- a/automation/scripts/qemu-smoke-dom0-arm64.sh
> > +++ b/automation/scripts/qemu-smoke-dom0-arm64.sh
> > @@ -87,7 +87,7 @@ LOAD_CMD="tftpb"
> >  UBOOT_SOURCE="boot.source"
> >  UBOOT_SCRIPT="boot.scr"' > binaries/config
> >  rm -rf imagebuilder
> > -git clone https://gitlab.com/ViryaOS/imagebuilder
> > +git clone https://gitlab.com/xen-project/imagebuilder.git
> >  bash imagebuilder/scripts/uboot-script-gen -t tftp -d binaries/ -c 
> > binaries/config
> >  
> >  
> > diff --git a/automation/scripts/qemu-smoke-dom0less-arm32.sh 
> > b/automation/scripts/qemu-smoke-dom0less-arm32.sh
> > index 1e2b939aadf7..11804cbd729f 100755
> > --- a/automation/scripts/qemu-smoke-dom0less-arm32.sh
> > +++ b/automation/scripts/qemu-smoke-dom0less-arm32.sh
> > @@ -125,7 +125,7 @@ if [[ "${test_variant}" == "without-dom0" ]]; then
> >  fi
> >  
> >  rm -rf imagebuilder
> > -git clone https://gitlab.com/ViryaOS/imagebuilder
> > +git clone https://gitlab.com/xen-project/imagebuilder.git
> >  bash imagebuilder/scripts/uboot-script-gen -t tftp -d . -c config
> >  
> >  # Run the test
> > diff --git a/automation/scripts/qemu-smoke-dom0less-arm64.sh 
> > b/automation/scripts/qemu-smoke-dom0less-arm64.sh
> > index 292c38a56147..4b548d1f8e54 100755
> > --- a/automation/scripts/qemu-smoke-dom0less-arm64.sh
> > +++ b/automation/scripts/qemu-smoke-dom0less-arm64.sh
> > @@ -198,7 +198,7 @@ NUM_CPUPOOLS=1' >> binaries/config
> >  fi
> >  
> >  rm -rf imagebuilder
> > -git clone https://gitlab.com/ViryaOS/imagebuilder
> > +git clone https://gitlab.com/xen-project/imagebuilder.git
> >  bash imagebuilder/scripts/uboot-script-gen -t tftp -d binaries/ -c 
> > binaries/config
> >  
> >  
> > diff --git a/automation/scripts/qemu-xtf-dom0less-arm64.sh 
> > b/automation/scripts/qemu-xtf-dom0less-arm64.sh
> > index a667e0412c92..59f926d35fb9 100755
> > --- a/automation/scripts/qemu-xtf-dom0less-arm64.sh
> > +++ b/automation/scripts/qemu-xtf-dom0less-arm64.sh
> > @@ -45,7 +45,7 @@ UBOOT_SOURCE="boot.source"
> >  UBOOT_SCRIPT="boot.scr"' > binaries/config
> >  
> >  rm -rf imagebuilder
> > -git clone https://gitlab.com/ViryaOS/imagebuilder
> > +git clone https://gitlab.com/xen-project/imagebuilder.git
> >  bash imagebuilder/scripts/uboot-script-gen -t tftp -d binaries/ -c 
> > binaries/config
> >  
> >  # Run the test
> > diff --git a/automation/scripts/xilinx-smoke-dom0less-arm64.sh 
> > b/automation/scripts/xilinx-smoke-dom0less-arm64.sh
> > index 4a071c6ef148..e3f7648d5031 100755
> > --- a/automation/scripts/xilinx-smoke-dom0less-arm64.sh
> > +++ b/automation/scripts/xilinx-smoke-dom0less-arm64.sh
> > @@ -122,7 +122,7 @@ if [[ "${test_variant}" == "gem-passthrough" ]]; then
> >  fi
> >  
> >  rm -rf imagebuilder
> > -git clone https://gitlab.com/ViryaOS/imagebuilder
> > +git clone https://gitlab.com/xen-project/imagebuilder.git
> >  bash imagebuilder/scripts/uboot-script-gen -t tftp -d $TFTP/ -c 
> > $TFTP/config
> >  
> >  # restart the board
> 
> Cheers,
> Alejandro
>