[Launchpad-reviewers] [Merge] lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into lp:lp-staging-scripts
The proposal to merge lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into lp:lp-staging-scripts has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium/+merge/384703 -- Your team Launchpad code reviewers is subscribed to branch lp:lp-staging-scripts. ___ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : launchpad-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
Re: [Launchpad-reviewers] [Merge] lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into lp:lp-staging-scripts
Review: Approve +1 -- https://code.launchpad.net/~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium/+merge/384703 Your team Launchpad code reviewers is subscribed to branch lp:lp-staging-scripts. ___ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : launchpad-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
Re: [Launchpad-reviewers] [Merge] lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into lp:lp-staging-scripts
Review: Approve LGTM -- https://code.launchpad.net/~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium/+merge/384703 Your team Launchpad code reviewers is subscribed to branch lp:lp-staging-scripts. ___ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : launchpad-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
Re: [Launchpad-reviewers] [Merge] lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into lp:lp-staging-scripts
Review: Approve -- https://code.launchpad.net/~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium/+merge/384703 Your team Launchpad code reviewers is subscribed to branch lp:lp-staging-scripts. ___ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : launchpad-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
Re: [Launchpad-reviewers] [Merge] lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into lp:lp-staging-scripts
Thank you Colin, merged and review comments addressed. Ready for another look. -- https://code.launchpad.net/~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium/+merge/384703 Your team Launchpad code reviewers is requested to review the proposed merge of lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into lp:lp-staging-scripts. ___ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : launchpad-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
Re: [Launchpad-reviewers] [Merge] lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into lp:lp-staging-scripts
I think this is mostly OK, but would like to have another look over it once
conflicts are fixed.
Diff comments:
> === modified file 'staging_restore.sh'
> --- staging_restore.sh2020-05-22 13:39:08 +
> +++ staging_restore.sh2020-05-28 08:56:52 +
> @@ -189,15 +189,31 @@
> ssh launchpad@gandwana.internal rsync -a --delete
> /srv/staging.launchpad.net/staging/launchpad/
> /srv/staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/
> ssh lp_dep...@atemoya.canonical.com rsync -a --delete
> /srv/builddmaster.staging.launchpad.net/staging/launchpad/
> /srv/builddmaster.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/
> ssh impo...@strawberry.canonical.com rsync -a --delete
> /srv/importd.staging.launchpad.net/staging/launchpad/
> /srv/importd.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/
> +ssh -p 922 supermir...@tellurium.canonical.com rsync -a --delete
> /srv/bazaar.staging.launchpad.net/staging/launchpad/
> /srv/bazaar.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/
> +ssh -p 922 loggerh...@tellurium.canonical.com rsync -a --delete-after
> --exclude=sourcecode/launchpad-loggerhead/logs
> /srv/codebrowse.staging.launchpad.net/staging/launchpad/
> /srv/codebrowse.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/
>
> rsync -a --delete ${BUILTCODEDIR}/
> impo...@strawberry.canonical.com:/srv/importd.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/
> >> $LOGFILE 2>&1
> rsync -a --delete ${BUILTCODEDIR}/
> launch...@atemoya.canonical.com:/srv/staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/
> >> $LOGFILE 2>&1
> +<<< TREE
> rsync -a --delete ${BUILTCODEDIR}/
> launchpad@gandwana.internal:/srv/staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/
> >> $LOGFILE 2>&1
> +===
> +rsync -a --delete ${BUILTCODEDIR}/
> launch...@gandwana.canonical.com:/srv/staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/
> >> $LOGFILE 2>&1
> +rsync -a -e 'ssh -p 922' --delete ${BUILTCODEDIR}/
> supermir...@tellurium.canonical.com:/srv/bazaar.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/
> >> $LOGFILE 2>&1
> +rsync -a -e 'ssh -p 922' --delete ${BUILTCODEDIR}/
> loggerh...@tellurium.canonical.com:/srv/codebrowse.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/
> >> $LOGFILE 2>&1
> +
> +>>> MERGE-SOURCE
You'll need to "bzr merge lp:lp-staging-scripts", resolve conflicts, and commit.
> ssh lp_dep...@atemoya.canonical.com "rsync -a --delete
> /srv/staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/
> /srv/builddmaster.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/"
> >> $LOGFILE 2>&1
> ssh launch...@atemoya.canonical.com "make -C
> /srv/staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO} build
> LPCONFIG=staging" >> $LOGFILE 2>&1
> ssh lp_dep...@atemoya.canonical.com "make -C
> /srv/builddmaster.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}
> compile LPCONFIG=staging-ftpmaster" >> $LOGFILE 2>&1
> ssh impo...@strawberry.canonical.com "make -C
> /srv/importd.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}
> compile LPCONFIG=staging" >> $LOGFILE 2>&1
> +<<< TREE
> ssh launchpad@gandwana.internal "make -C
> /srv/staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO} compile
> LPCONFIG=staging" >> $LOGFILE 2>&1
> +===
> +ssh launch...@gandwana.canonical.com "make -C
> /srv/staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO} compile
> LPCONFIG=staging" >> $LOGFILE 2>&1
> +ssh -p 922 supermir...@tellurium.canonical.com "make -C
> /srv/bazaar.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}
> compile LPCONFIG=staging" >> $LOGFILE 2>&1
> +ssh -p 922 loggerh...@tellurium.canonical.com "make -C
> /srv/codebrowse.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}
> compile LPCONFIG=staging" >> $LOGFILE 2>&1
> +
> +>>> MERGE-SOURCE
> # Let's put a "maintenance" file in place so nagios doesn't scream
> # and cron jobs know to not process
> ssh launch...@atemoya.canonical.com "date +%s >
> /srv/staging.launchpad.net/maintenance.txt"
> @@ -206,6 +222,14 @@
> ssh impo...@strawberry.canonical.com touch
> /srv/importd.staging.launchpad.net/maintenance.txt >> $LOGFILE 2>&1
> ssh launch...@atemoya.canonical.com
> "/srv/staging.launchpad.net/initscript stop" >> $LOGFILE 2>&1
> ssh lp_bui...@atemoya.canonical.com "sudo service buildd-manager stop"
> >> $LOGFILE 2>&1
> +# Stop codehosting services on Tellurium
Machine names should normally be in all-lower-case.
> +ssh -p 922 supermir...@tellurium.canonical.com
> "/etc/init.d/bzr-sftp-staging1 stop" >> $LOGFILE 2>&1
> +ssh -p 922 supermir...@tellurium.canonical.com
> "/etc/init.d/bzr-lp-forking-service-staging1 stop" >> $LOGFILE 2>&1
> +ssh -p 922 supermir...@tellurium.canonical.com
>
[Launchpad-reviewers] [Merge] lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into lp:lp-staging-scripts
The proposal to merge lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into lp:lp-staging-scripts has been updated. Description changed to: Codehosting and codebrowse were deployed to telllurium (one of our staging servers) by running crontabs: https://bazaar.launchpad.net/~launchpad-pqm/lp-production-crontabs/staging/view/head%3A/tellurium.canonical.com-supermirror and: https://bazaar.launchpad.net/~launchpad-pqm/lp-production-crontabs/staging/view/head:/tellurium.canonical.com-loggerhead This branch updates only the staging_restore.sh script to do deploy to tellurium. Modifications to above two crontabs to stop deploying to tellurium are done in a separate merge proposal: https://code.launchpad.net/~ilasc/lp-production-crontabs/staging/+merge/384708 For more details, see: https://code.launchpad.net/~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium/+merge/384703 -- Your team Launchpad code reviewers is requested to review the proposed merge of lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into lp:lp-staging-scripts. ___ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : launchpad-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
[Launchpad-reviewers] [Merge] lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into lp:lp-staging-scripts
The proposal to merge lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into lp:lp-staging-scripts has been updated. Description changed to: Codehosting and codebrowse were deployed to telllurium (one of our staging servers) by running crontabs: https://bazaar.launchpad.net/~launchpad-pqm/lp-production-crontabs/staging/view/head%3A/tellurium.canonical.com-supermirror and: https://bazaar.launchpad.net/~launchpad-pqm/lp-production-crontabs/staging/view/head:/tellurium.canonical.com-loggerhead This branch updates only the staging_restore.sh script to do deploy to tellurium. Modifications to above two crontabs to stop deploying to tellurium are done in a separate merge proposal: https://code.launchpad.net/~ilasc/lp-production-crontabs/staging/+merge/384707 For more details, see: https://code.launchpad.net/~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium/+merge/384703 -- Your team Launchpad code reviewers is requested to review the proposed merge of lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into lp:lp-staging-scripts. ___ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : launchpad-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
[Launchpad-reviewers] [Merge] lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into lp:lp-staging-scripts
Ioana Lasc has proposed merging
lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into
lp:lp-staging-scripts.
Commit message:
Update staging_restore.sh to deploy to tellurium
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
For more details, see:
https://code.launchpad.net/~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium/+merge/384703
Codehosting and codebrowse were deployed to telllurium (one of our staging
servers) by running crontabs:
https://bazaar.launchpad.net/~launchpad-pqm/lp-production-crontabs/staging/view/head%3A/tellurium.canonical.com-supermirror
and:
https://bazaar.launchpad.net/~launchpad-pqm/lp-production-crontabs/staging/view/head:/tellurium.canonical.com-loggerhead
This branch updates only the staging_restore.sh script to do deploy to
tellurium.
Modifications to above two crontabs to stop deploying to tellurium are done in
separate merge proposals for the files themselves.
--
Your team Launchpad code reviewers is requested to review the proposed merge of
lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into
lp:lp-staging-scripts.
=== modified file 'staging_restore.sh'
--- staging_restore.sh 2020-05-22 13:39:08 +
+++ staging_restore.sh 2020-05-28 08:56:52 +
@@ -189,15 +189,31 @@
ssh launchpad@gandwana.internal rsync -a --delete /srv/staging.launchpad.net/staging/launchpad/ /srv/staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/
ssh lp_dep...@atemoya.canonical.com rsync -a --delete /srv/builddmaster.staging.launchpad.net/staging/launchpad/ /srv/builddmaster.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/
ssh impo...@strawberry.canonical.com rsync -a --delete /srv/importd.staging.launchpad.net/staging/launchpad/ /srv/importd.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/
+ssh -p 922 supermir...@tellurium.canonical.com rsync -a --delete /srv/bazaar.staging.launchpad.net/staging/launchpad/ /srv/bazaar.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/
+ssh -p 922 loggerh...@tellurium.canonical.com rsync -a --delete-after --exclude=sourcecode/launchpad-loggerhead/logs /srv/codebrowse.staging.launchpad.net/staging/launchpad/ /srv/codebrowse.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/
rsync -a --delete ${BUILTCODEDIR}/ impo...@strawberry.canonical.com:/srv/importd.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/ >> $LOGFILE 2>&1
rsync -a --delete ${BUILTCODEDIR}/ launch...@atemoya.canonical.com:/srv/staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/ >> $LOGFILE 2>&1
+<<< TREE
rsync -a --delete ${BUILTCODEDIR}/ launchpad@gandwana.internal:/srv/staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/ >> $LOGFILE 2>&1
+===
+rsync -a --delete ${BUILTCODEDIR}/ launch...@gandwana.canonical.com:/srv/staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/ >> $LOGFILE 2>&1
+rsync -a -e 'ssh -p 922' --delete ${BUILTCODEDIR}/ supermir...@tellurium.canonical.com:/srv/bazaar.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/ >> $LOGFILE 2>&1
+rsync -a -e 'ssh -p 922' --delete ${BUILTCODEDIR}/ loggerh...@tellurium.canonical.com:/srv/codebrowse.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/ >> $LOGFILE 2>&1
+
+>>> MERGE-SOURCE
ssh lp_dep...@atemoya.canonical.com "rsync -a --delete /srv/staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/ /srv/builddmaster.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO}/" >> $LOGFILE 2>&1
ssh launch...@atemoya.canonical.com "make -C /srv/staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO} build LPCONFIG=staging" >> $LOGFILE 2>&1
ssh lp_dep...@atemoya.canonical.com "make -C /srv/builddmaster.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO} compile LPCONFIG=staging-ftpmaster" >> $LOGFILE 2>&1
ssh impo...@strawberry.canonical.com "make -C /srv/importd.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO} compile LPCONFIG=staging" >> $LOGFILE 2>&1
+<<< TREE
ssh launchpad@gandwana.internal "make -C /srv/staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO} compile LPCONFIG=staging" >> $LOGFILE 2>&1
+===
+ssh launch...@gandwana.canonical.com "make -C /srv/staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO} compile LPCONFIG=staging" >> $LOGFILE 2>&1
+ssh -p 922 supermir...@tellurium.canonical.com "make -C /srv/bazaar.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO} compile LPCONFIG=staging" >> $LOGFILE 2>&1
+ssh -p 922 loggerh...@tellurium.canonical.com "make -C /srv/codebrowse.staging.launchpad.net/staging/launchpad-rev-${SOURCEREVNO} compile LPCONFIG=staging" >> $LOGFILE 2>&1
+
+>>> MERGE-SOURCE
# Let's put a "maintenance" file in place so nagios doesn't scream
# and cron jobs know to not process
ssh launch...@atemoya.canonical.com "date +%s > /srv/staging.launchpad.net/maintenance.txt"
@@ -206,6 +222,14 @@
Re: [Launchpad-reviewers] [Merge] lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into lp:lp-staging-scripts
This merge proposal is being monitored by mergebot. Change the status to Approved to merge. -- https://code.launchpad.net/~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium/+merge/384703 Your team Launchpad code reviewers is requested to review the proposed merge of lp:~ilasc/lp-staging-scripts/staging-restore-deploy-tellurium into lp:lp-staging-scripts. ___ Mailing list: https://launchpad.net/~launchpad-reviewers Post to : launchpad-reviewers@lists.launchpad.net Unsubscribe : https://launchpad.net/~launchpad-reviewers More help : https://help.launchpad.net/ListHelp
