v.io/x/devtools: Auto deployment of the website.
The vanadium-website-deploy will be called from the new
https://veyron.corp.google.com/jenkins/job/vanadium-website-deploy
target on Jenkins. This target is setup to only run when
vanadium-website-site test passes.
MultiPart: 2/2
Change-Id: I653c1d93c6240144cc78c758e5f201bacee377e1
diff --git a/jiri-test/internal/test/run.go b/jiri-test/internal/test/run.go
index d9ec6b7..449cff4 100644
--- a/jiri-test/internal/test/run.go
+++ b/jiri-test/internal/test/run.go
@@ -150,6 +150,7 @@
"vanadium-signup-welcome-1-new": vanadiumSignupWelcomeStepOneNew,
"vanadium-signup-welcome-2-new": vanadiumSignupWelcomeStepTwoNew,
"vanadium-travel-test": vanadiumTravelTest,
+ "vanadium-website-deploy": vanadiumWebsiteDeploy,
"vanadium-website-site": vanadiumWebsiteSite,
"vanadium-website-tutorials-core": vanadiumWebsiteTutorialsCore,
"vanadium-website-tutorials-external": vanadiumWebsiteTutorialsExternal,
diff --git a/jiri-test/internal/test/website.go b/jiri-test/internal/test/website.go
index aa6f546..e2793d6 100644
--- a/jiri-test/internal/test/website.go
+++ b/jiri-test/internal/test/website.go
@@ -27,12 +27,6 @@
}
defer collect.Error(func() error { return cleanup() }, &e)
- cleanup2, err := initTestForTarget(jirix, testName, []string{"v23:nacl"}, "amd64p32-nacl")
- if err != nil {
- return nil, newInternalError(err, "Init")
- }
- defer collect.Error(func() error { return cleanup2() }, &e)
-
s := jirix.NewSeq()
if err := s.Chdir(filepath.Join(jirix.Root, "website")).
Run("make", "clean").
@@ -50,6 +44,10 @@
return &test.Result{Status: test.Passed}, nil
}
+func vanadiumWebsiteDeploy(jirix *jiri.X, testName string, _ ...Opt) (*test.Result, error) {
+ return commonVanadiumWebsite(jirix, testName, "deploy", defaultWebsiteTestTimeout, nil)
+}
+
func vanadiumWebsiteSite(jirix *jiri.X, testName string, _ ...Opt) (*test.Result, error) {
return commonVanadiumWebsite(jirix, testName, "test-site", defaultWebsiteTestTimeout, nil)
}
