diff --git a/installer/fileserver/main.go b/installer/fileserver/main.go
index 974c07d9a5..76e1114b5d 100644
--- a/installer/fileserver/main.go
+++ b/installer/fileserver/main.go
@@ -140,14 +140,14 @@ func parseServerConfig(op trace.Operation, conf *serverConfig) {
// cspMiddleware sets the Content-Security-Policy header to prevent clickjacking
// https://www.owasp.org/index.php/Content_Security_Policy_Cheat_Sheet#Preventing_Clickjacking
func cspMiddleware() func(next http.Handler) http.Handler {
- header := "Content-Security-Policy"
- value := "frame-ancestors 'none';"
- return func(next http.Handler) http.Handler {
- return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
- w.Header().Add(header, value)
- next.ServeHTTP(w, r)
- })
- }
+ header := "Content-Security-Policy"
+ value := "frame-ancestors 'none';"
+ return func(next http.Handler) http.Handler {
+ return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ w.Header().Add(header, value)
+ next.ServeHTTP(w, r)
+ })
+ }
}
func main() {
diff --git a/installer/fileserver/routes/index.go b/installer/fileserver/routes/index.go
index 4670667da8..a1b8ecdce2 100644
--- a/installer/fileserver/routes/index.go
+++ b/installer/fileserver/routes/index.go
@@ -60,6 +60,8 @@ func (i *IndexHTMLRenderer) IndexHandler(resp http.ResponseWriter, req *http.Req
if err := indexFormHandler(op, req, html); err != nil {
op.Errorf("Install failed: %s", err.Error())
html.InitErrorFeedback = fmt.Sprintf("Installation failed: %s", err.Error())
+ } else if req.FormValue("needuiplugin") == "true" {
+ html.InitSuccessFeedback = "Installation successful. Refer to the Post-install and Deployment tasks below. Please logout and login vCenter Server twice to view the new ui plugin."
} else {
html.InitSuccessFeedback = "Installation successful. Refer to the Post-install and Deployment tasks below."
}
@@ -99,16 +101,18 @@ func indexFormHandler(op trace.Operation, req *http.Request, html *IndexHTMLOpti
return err
}
- h5 := tasks.NewH5UIPlugin(PSCConfig.Admin)
- h5.Force = true
- if err := h5.Install(op); err != nil {
- return err
- }
+ if req.FormValue("needuiplugin") == "true" {
+ h5 := tasks.NewH5UIPlugin(PSCConfig.Admin)
+ h5.Force = true
+ if err := h5.Install(op); err != nil {
+ return err
+ }
- flex := tasks.NewFlexUIPlugin(PSCConfig.Admin)
- flex.Force = true
- if err := flex.Install(op); err != nil {
- return err
+ flex := tasks.NewFlexUIPlugin(PSCConfig.Admin)
+ flex.Force = true
+ if err := flex.Install(op); err != nil {
+ return err
+ }
}
return nil
diff --git a/installer/fileserver/tasks/plugin.go b/installer/fileserver/tasks/plugin.go
index 9660f452e5..0811561f31 100644
--- a/installer/fileserver/tasks/plugin.go
+++ b/installer/fileserver/tasks/plugin.go
@@ -137,9 +137,8 @@ func (p *Plugin) Install(op trace.Operation) error {
}
vCenterVersion := p.Target.Session.Client.ServiceContent.About.Version
if p.denyInstall(op, vCenterVersion) {
- err := errors.Errorf("Refusing to install Flex plugin on vSphere %s", vCenterVersion)
- op.Error(err)
- return err
+ op.Warnf("Refusing to install Flex plugin on vSphere %s", vCenterVersion)
+ return nil
}
op.Infof("### Installing UI Plugin against vSphere %s ####", vCenterVersion)
diff --git a/installer/scripts/ci-build.sh b/installer/scripts/ci-build.sh
index e97bc1ee04..0851c2d60d 100755
--- a/installer/scripts/ci-build.sh
+++ b/installer/scripts/ci-build.sh
@@ -33,7 +33,7 @@ if [ -n "${VICENGINE}" ]; then
OPTIONS="$OPTIONS --vicengine $VICENGINE"
fi
if [ -n "${VICUI}" ]; then
- OPTIONS="$OPTIONS --vicui $VICENGINE"
+ OPTIONS="$OPTIONS --vicui $VICUI"
fi
if [ -n "${VIC_MACHINE_SERVER}" ]; then
OPTIONS="$OPTIONS --vicmachineserver $VIC_MACHINE_SERVER"
@@ -61,8 +61,13 @@ if [[ ( "$DRONE_BUILD_EVENT" == "tag" && "$DRONE_TAG" != *"dev"* ) || "$DRONE_BR
OPTIONS="$OPTIONS --vicengine ${vicengine_release:?Unable to find an appropriate VIC Engine build. Is '"'$DRONE_BRANCH'"' a valid vmware/vic branch?}"
fi
if [ -z "${VICUI}" ]; then
- vicui_release=$(gsutil ls -l "gs://vic-ui-releases" | grep -v TOTAL | grep vic_ | sort -k2 -r | (trap '' PIPE; head -1) | xargs | cut -d " " -f 3 | sed 's/gs:\/\//https:\/\/storage.googleapis.com\//')
- OPTIONS="$OPTIONS --vicui $vicui_release"
+ if [[ "$DRONE_BUILD_EVENT" != "tag" || "$DRONE_TAG" == *"dev"* ]]; then
+ bucket="gs://vic-ui-builds/$DRONE_BRANCH"
+ else
+ bucket="gs://vic-ui-releases"
+ fi
+ vicui_release=$(gsutil ls -l "$bucket" | grep -v TOTAL | grep vic_ | sort -k2 -r | (trap '' PIPE; head -1) | xargs | cut -d " " -f 3 | sed 's/gs:\/\//https:\/\/storage.googleapis.com\//')
+ OPTIONS="$OPTIONS --vicui ${vicui_release:?Unable to find an appropriate VIC UI build. Is '"'$DRONE_BRANCH'"' a valid vmware/vic-ui branch?}"
fi
if [ -z "${VIC_MACHINE_SERVER}" ]; then
# Listing container tags requires permissions
diff --git a/tests/test-cases/Group2-Getting-Started/2-01-Getting-Started.robot b/tests/test-cases/Group2-Getting-Started/2-01-Getting-Started.robot
index 0fcb0e6270..a988b81176 100644
--- a/tests/test-cases/Group2-Getting-Started/2-01-Getting-Started.robot
+++ b/tests/test-cases/Group2-Getting-Started/2-01-Getting-Started.robot
@@ -24,4 +24,4 @@ Verify Getting Started page
Log To Console Initializing the OVA using the getting started ui...
Navigate To Getting Started Page
Verify Getting Started Page Title
- Log In And Complete OVA Installation
+ #Log In And Complete OVA Installation