Skip to content

[MASTER][WORKER] Don't build and upload livecd artifacts anymore #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HBelusca wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[MASTER][WORKER] Don't build and upload livecd artifacts anymore #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 0 additions & 6 deletions master/master.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,6 @@ bs_git = steps.Git(repourl='https://github.com/reactos/reactos.git', mode='full'
bs_clean = steps.ShellCommand(name="clean", command=["bash", scripts_root + "clean"], description=["cleaning"], descriptionDone=["clean"], haltOnFailure=True)
bs_prepare_source = steps.ShellCommand(name="prepare_source", command=["bash", scripts_root + "prepare_source", util.WithProperties("%(id:-)s")], description=["preparing source"], descriptionDone=["prepared source"], haltOnFailure=True)
bs_bootcd = steps.Compile(name="bootcd", command=["bash", scripts_root + "build_reactos", "bootcd"], warningPattern="^(.*warning[: ].*|.*error[: ].*)", description=["BootCD"], descriptionDone=["BootCD"])
bs_livecd = steps.Compile(name="livecd", command=["bash", scripts_root + "build_reactos", "livecd"], warningPattern="^(.*warning[: ].*|.*error[: ].*)", description=["LiveCD"], descriptionDone=["LiveCD"])
bs_get_suffix = steps.SetPropertyFromCommand(command=["bash", scripts_root + "get_suffix"], property="suffix")
bs_upload_iso = steps.ShellCommand(name="uploadiso", command=["bash", scripts_root + "uploadiso"], description=["uploading"], descriptionDone=["uploaded"])
bs_submit_results = steps.ShellCommand(name="submit_results", command=["bash", scripts_root + "submit_result", util.WithProperties('%(buildnumber)s'), util.WithProperties('%(reason:-)s'), util.WithProperties('%(id:-)s')], description=["submitting results"], descriptionDone=["submit results"])
Expand Down Expand Up @@ -271,7 +270,6 @@ Build_GCCLin_x86.addStep(bs_git)
Build_GCCLin_x86.addStep(bs_prepare_source)
Build_GCCLin_x86.addStep(make_bs_configure())
Build_GCCLin_x86.addStep(bs_bootcd)
Build_GCCLin_x86.addStep(bs_livecd)
Build_GCCLin_x86.addStep(make_bs_regtestcd("-DENABLE_ROSTESTS=1"))
Build_GCCLin_x86.addStep(bs_get_suffix)
Build_GCCLin_x86.addStep(make_bs_trigger("Build GCCLin_x86 regtestcd done"))
Expand All @@ -283,7 +281,6 @@ Build_GCCLin_x86_Release.addStep(bs_git)
Build_GCCLin_x86_Release.addStep(bs_prepare_source)
Build_GCCLin_x86_Release.addStep(make_bs_configure("-DCMAKE_BUILD_TYPE=Release"))
Build_GCCLin_x86_Release.addStep(bs_bootcd)
Build_GCCLin_x86_Release.addStep(bs_livecd)
Build_GCCLin_x86_Release.addStep(bs_upload_iso)

Build_GCCWin_x86 = util.BuildFactory();
Expand All @@ -292,15 +289,13 @@ Build_GCCWin_x86.addStep(bs_git)
Build_GCCWin_x86.addStep(bs_prepare_source)
Build_GCCWin_x86.addStep(make_bs_configure("-DENABLE_ROSAPPS=1", "-DENABLE_ROSTESTS=1"))
Build_GCCWin_x86.addStep(bs_bootcd)
Build_GCCWin_x86.addStep(bs_livecd)

Build_MSVC_x86 = util.BuildFactory();
Build_MSVC_x86.addStep(bs_clean)
Build_MSVC_x86.addStep(bs_git)
Build_MSVC_x86.addStep(bs_prepare_source)
Build_MSVC_x86.addStep(make_bs_configure())
Build_MSVC_x86.addStep(bs_bootcd)
Build_MSVC_x86.addStep(bs_livecd)
Build_MSVC_x86.addStep(bs_upload_iso)

Build_MSVC_x64 = util.BuildFactory();
Expand All @@ -309,7 +304,6 @@ Build_MSVC_x64.addStep(bs_git)
Build_MSVC_x64.addStep(bs_prepare_source)
Build_MSVC_x64.addStep(make_bs_configure())
Build_MSVC_x64.addStep(bs_bootcd)
Build_MSVC_x64.addStep(bs_livecd)
Build_MSVC_x64.addStep(bs_build_rostests)
Build_MSVC_x64.addStep(bs_get_suffix)
Build_MSVC_x64.addStep(make_bs_trigger("Build MSVC_x64 rostests done"))
Expand Down
3 changes: 1 addition & 2 deletions worker/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ReactOS BuildBot Build Scripts

Some possible usage scenarios for these scripts:

* Plainbot: Builds a Boot-CD, Live-CD, Test-CD, triggers a Testbot for testing it and uploads the created ISO file.
* Plainbot: Builds a Boot-CD, a Test-CD, and triggers a Testbot for testing it and uploads the created ISO files.
If a patch ID is given, the patch is applied first, but the build is not uploaded.
* Testbot: Triggered by a Plainbot, performs regression testing on a Test-CD and submits the results.
Generally, this one is implemented as an independent builder to not block the Plainbot doing its other tasks. But its steps can also be integrated inside a Plainbot.
Expand All @@ -20,7 +20,6 @@ Git update *
prepare_source *
configure *
build_reactos bootcd *
build_reactos livecd *
regtestcd *
Trigger Testbot *
vbox_clean / vmware_clean *
Expand Down
20 changes: 3 additions & 17 deletions worker/uploadiso
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
# ReactOS BuildBot Build Scripts
# uploadiso - Publish the created Boot-CD and Live-CD on iso.reactos.org in compressed files.
# uploadiso - Publish the created Boot-CD on iso.reactos.org in compressed files.
source ../../config.inc

# Some config for accessing iso.reactos.org, but common to all builders
Expand All @@ -18,20 +18,18 @@ esac

# Check what files we have.
[ -f "$ROS_OUTPUT/bootcd.iso" ] && BOOTCD=1 || BOOTCD=0
[ -f "$ROS_OUTPUT/livecd.iso" ] && LIVECD=1 || LIVECD=0

if [ $BOOTCD -eq 0 -a $LIVECD -eq 0 ]; then
if [ $BOOTCD -eq 0 ]; then
echo "* There are no ISO files to process."
exit 2
fi

# Rsync them onto the file server.
BOOT=reactos-bootcd-$REVISION_SUFFIX-$UPLOAD_SUFFIX
LIVE=reactos-livecd-$REVISION_SUFFIX-$UPLOAD_SUFFIX

echo "* Rsyncing ISO files onto iso.reactos.org..."
cd $ROS_OUTPUT
rsync --stats -e "ssh -l $UPLOAD_USER -i $UPLOAD_KEY" -rtvz --include=bootcd.iso --include=livecd.iso --exclude=* . $UPLOAD_HOST:$UPLOAD_TEMPDIR || exit 1
rsync --stats -e "ssh -l $UPLOAD_USER -i $UPLOAD_KEY" -rtvz --include=bootcd.iso --exclude=* . $UPLOAD_HOST:$UPLOAD_TEMPDIR || exit 1
echo -e "* Done.\n"

# Remotely compress them on the file server and update symbolic links.
Expand All @@ -46,15 +44,3 @@ if [ $BOOTCD ]; then
else
echo "* There is no $BOOT to compress."
fi

if [ $LIVECD ]; then
echo "* Remotely compressing $LIVE..."
ssh $SSHOPTS "ln $UPLOAD_TEMPDIR/livecd.iso $UPLOAD_TEMPDIR/$LIVE.iso"
ssh $SSHOPTS "7za a -bd -t7z $UPLOAD_TEMPDIR/$LIVE.7z $UPLOAD_TEMPDIR/$LIVE.iso -mx9 | tail -n +4"
ssh $SSHOPTS "rm $UPLOAD_TEMPDIR/$LIVE.iso"
ssh $SSHOPTS "mv $UPLOAD_TEMPDIR/$LIVE.7z $UPLOAD_ISODIR/livecd/"
ssh $SSHOPTS "chmod 0644 $UPLOAD_ISODIR/livecd/$LIVE.7z"
ssh $SSHOPTS "ln -snf $LIVE.7z $UPLOAD_ISODIR/livecd/latest-$UPLOAD_SUFFIX"
else
echo "* There is no $LIVE to compress."
fi