diff --git a/BuildFiles/Packaging/templates/control-external-scripts-internal.template b/BuildFiles/Packaging/templates/control-external-scripts-internal.template index a1994b2d..b080e0b0 100644 --- a/BuildFiles/Packaging/templates/control-external-scripts-internal.template +++ b/BuildFiles/Packaging/templates/control-external-scripts-internal.template @@ -3,6 +3,7 @@ Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) Homepage: http://swarmops.com/ +Conflicts: swarmops-frontend-external-scripts,swarmops-frontend-external-scripts-stable Description: Swarmops External Scripts Swarmops is a swarm activist administration system. This package contains external, nonrequired scripts that diff --git a/BuildFiles/Packaging/templates/control-external-scripts-release.template b/BuildFiles/Packaging/templates/control-external-scripts-release.template index a045d7c8..692b6cf6 100644 --- a/BuildFiles/Packaging/templates/control-external-scripts-release.template +++ b/BuildFiles/Packaging/templates/control-external-scripts-release.template @@ -1,8 +1,9 @@ -Package: swarmops-frontend-external-scripts +Package: swarmops-frontend-external-scripts-stable Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) Homepage: http://swarmops.com/ +Conflicts: swarmops-frontend-external-scripts-internal,swarmops-frontend-external-scripts Description: Swarmops External Scripts Swarmops is a swarm activist administration system. This package contains external, nonrequired scripts that diff --git a/BuildFiles/Packaging/templates/control-external-scripts-sprint.template b/BuildFiles/Packaging/templates/control-external-scripts-sprint.template index a045d7c8..53daea62 100644 --- a/BuildFiles/Packaging/templates/control-external-scripts-sprint.template +++ b/BuildFiles/Packaging/templates/control-external-scripts-sprint.template @@ -3,6 +3,7 @@ Version: --BuildNumber-- Architecture: all Maintainer: Rick Falkvinge (swarmops-maintain@falkvinge.net) Homepage: http://swarmops.com/ +Conflicts: swarmops-frontend-external-scripts-internal,swarmops-frontend-external-scripts-stable Description: Swarmops External Scripts Swarmops is a swarm activist administration system. This package contains external, nonrequired scripts that diff --git a/BuildFiles/Packaging/templates/mail-sprint-ready.txt b/BuildFiles/Packaging/templates/mail-sprint-ready.txt index 732cae4b..6c4f0cd7 100644 --- a/BuildFiles/Packaging/templates/mail-sprint-ready.txt +++ b/BuildFiles/Packaging/templates/mail-sprint-ready.txt @@ -1,3 +1,7 @@ A sprint build has been deployed to staging area. It is ready for packaging and deployment. -Shell to swarmops-build, sudo su, and run the 'do-swarmops-sprint' script in /home/rick to deploy the sprint. +Shell to swarmops-build, sudo su, and run these scripts: + +First, './do-swarmops-candidate' scripts to deploy as Release Candidate to run RC tests. + +Second, './do-swarmops-sprint' script if all RC tests pass, to deploy the sprint from the same build live.