xen: Use staging-VV rather than stable-VV

The logic is the same as using 'staging' rather than 'master': We
ultimately want to make sure that it checks in as-is, without relying
on the push gate to have succeeded.

Update it in XenStableBranch, repo update, and the systemtest.

Signed-off-by: George Dunlap <george.dunlap@citrix.com>

diff --git a/README.md b/README.md
index e1d3a2431e4b319531a2f23ef999a15d6e9f45e6..ffdbc1ae705cd73b9bbdb8ce024e5113fbedd41b 100644 (file)
--- a/README.md
+++ b/README.md
@@ -340,7 +340,7 @@ added or removed.
 `xsatool repo update`
 
 For each tree, this will do a fetch, then go through `master` and any
-branch named `stable-*` and to a 'merge'.
+branch named `staging-*` and to a 'merge --ff-only'.
 
 ## Updating the 'base' of an outstanding XSA when the stable branches have changed
 

diff --git a/repo.go b/repo.go
index 4c0f9995e8a88fe669413e91638688acb5bd55ed..da2e571323367ba164381e38a27dcb06bb24d4a3 100644 (file)
--- a/repo.go
+++ b/repo.go
@@ -153,7 +153,7 @@ func MainRepoUpdate(unused *XSAMeta, args []string) (ret int) {
                }
 
                // for master, stable-* branches: 'git merge'
-               branches, err := xr.Branches("stable-*")
+               branches, err := xr.Branches("staging-*")
 
                branches = append([]string{"master"}, branches...)
 

diff --git a/systemtest.go b/systemtest.go
index 91edce32c86cac1115d2692e560ddb0ac0f9db05..033234e1e4eb9c83a49aca4a66c017b117713982 100644 (file)
--- a/systemtest.go
+++ b/systemtest.go
@@ -40,11 +40,11 @@ var its = InitialTreeState{
        "xen": &map[string]string{
                "staging":    "ac9ff74",
                "master":     "ac9ff74",
-               "stable-4.8": "e0354e6",
-               "stable-4.7": "b5c7dea",
-               "stable-4.6": "bb92bb7",
-               "stable-4.5": "cde86fc",
-               "stable-4.4": "89bd1cf",
+               "staging-4.8": "e0354e6",
+               "staging-4.7": "b5c7dea",
+               "staging-4.6": "bb92bb7",
+               "staging-4.5": "cde86fc",
+               "staging-4.4": "89bd1cf",
        },
        "qemuu": &map[string]string{
                "master": "acde9f3",

diff --git a/xen.go b/xen.go
index ff4c2c404515d5995d83ccdbebfb75ba43b64a99..c97abc7ada9f6da265d112f157567c6748a9225f 100644 (file)
--- a/xen.go
+++ b/xen.go
@@ -239,7 +239,7 @@ func XenStableBranch(v XenVersion) string {
        if v == XenVersionMaster {
                return "staging"
        } else {
-               return "stable-" + v.String()
+               return "staging-" + v.String()
        }
 }
 

diff --git a/xsa.go b/xsa.go
index a1a217f8281544f2a57356d74f1442573cc226c9..e222efd2946f23b512421edae29ec4daf3abfa5b 100644 (file)
--- a/xsa.go
+++ b/xsa.go
@@ -130,7 +130,7 @@ func MainInit(xsa *XSAMeta, args []string) (ret int) {
                        xr := G.repos.GetRepoNC(t)
 
                        if err = xr.MakeStableBranch(v); err != nil {
-                               fmt.Printf("Checking out stable branch for version %v: %v\n",
+                               fmt.Printf("Checking out staging branch for version %v: %v\n",
                                        v, err)
                                return 1
                        }
@@ -139,7 +139,7 @@ func MainInit(xsa *XSAMeta, args []string) (ret int) {
                        tr.StableRef, err = xr.GetRefVersion(v)
 
                        if err != nil {
-                               fmt.Printf("Getting ref for stable version %v: %v\n",
+                               fmt.Printf("Getting ref for staging version %v: %v\n",
                                        v, err)
                        }
                        tr.Prereqs = append([]int{}, vm.XSAs[t]...)