Revert "ci: enable windows for testing heartbeat (#32937)"

This reverts commit 8552e34.
elastic · Sep 12, 2022 · 5991aa1 · 5991aa1
1 parent d20fff4
commit 5991aa1
Show file tree

Hide file tree

Showing 15 changed files with 55 additions and 59 deletions.
diff --git a/x-pack/heartbeat/Jenkinsfile.yml b/x-pack/heartbeat/Jenkinsfile.yml
@@ -34,36 +34,34 @@ stages:
                 - "macosTest"
             tags: true         ## for all the tags
         stage: extended
-    windows-2022:
-        mage: "mage build test"
-        platforms:             ## override default labels in this specific stage.
-          - "windows-2022"
-        stage: mandatory
-    windows-2019:
-        mage: "mage build test"
-        platforms:             ## override default labels in this specific stage.
-          - "windows-2019"
-        stage: extended_win
-    windows-2016:
-        mage: "mage build test"
-        platforms:             ## override default labels in this specific stage.
-          - "windows-2016"
-        stage: mandatory
-    windows-2012:
-        mage: "mage build test"
-        platforms:             ## override default labels in this specific stage.
-          - "windows-2012-r2"
-        stage: extended_win
-    windows-10:
-        mage: "mage build test"
-        platforms:             ## override default labels in this specific stage.
-          - "windows-10"
-        stage: extended_win
-    windows-8:
-        mage: "mage build test"
-        platforms:             ## override default labels in this specific stage.
-          - "windows-8"
-        stage: extended_win
+# TODO: there are windows test failures already reported
+# https://github.com/elastic/beats/issues/23957 and https://github.com/elastic/beats/issues/23958
+# waiting for being fixed.
+#    windows-2019:
+#        mage: "mage build test"
+#        platforms:             ## override default labels in this specific stage.
+#            - "windows-2019"
+#        stage: extended_win
+#    windows-2016:
+#        mage: "mage build test"
+#        platforms:             ## override default labels in this specific stage.
+#            - "windows-2016"
+#        stage: mandatory
+#    windows-2012:
+#        mage: "mage build test"
+#        platforms:             ## override default labels in this specific stage.
+#            - "windows-2012-r2"
+#        stage: extended_win
+#    windows-10:
+#        mage: "mage build test"
+#        platforms:             ## override default labels in this specific stage.
+#            - "windows-10"
+#        stage: extended_win
+#    windows-8:
+#        mage: "mage build test"
+#        platforms:             ## override default labels in this specific stage.
+#            - "windows-8"
+#        stage: extended_win
     packaging-linux:
         packaging-linux: "mage package"
         e2e:

diff --git a/x-pack/heartbeat/monitors/browser/source/inline.go b/x-pack/heartbeat/monitors/browser/source/inline.go
@@ -1,8 +1,6 @@
 // Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
-//go:build linux || darwin
-// +build linux darwin
 
 package source
 

diff --git a/x-pack/heartbeat/monitors/browser/source/inline_test.go b/x-pack/heartbeat/monitors/browser/source/inline_test.go
@@ -1,8 +1,6 @@
 // Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
-//go:build linux || darwin
-// +build linux darwin
 
 package source
 

diff --git a/x-pack/heartbeat/monitors/browser/source/local.go b/x-pack/heartbeat/monitors/browser/source/local.go
@@ -2,9 +2,6 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-//go:build linux || darwin
-// +build linux darwin
-
 package source
 
 import (

diff --git a/x-pack/heartbeat/monitors/browser/source/local_test.go b/x-pack/heartbeat/monitors/browser/source/local_test.go
@@ -2,9 +2,6 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-//go:build linux || darwin
-// +build linux darwin
-
 package source
 
 import (

diff --git a/x-pack/heartbeat/monitors/browser/source/offline.go b/x-pack/heartbeat/monitors/browser/source/offline.go
@@ -1,8 +1,6 @@
 // Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
-//go:build linux || darwin
-// +build linux darwin
 
 package source
 

diff --git a/x-pack/heartbeat/monitors/browser/source/project.go b/x-pack/heartbeat/monitors/browser/source/project.go
@@ -1,8 +1,6 @@
 // Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
-//go:build linux || darwin
-// +build linux darwin
 
 package source
 

diff --git a/x-pack/heartbeat/monitors/browser/source/project_test.go b/x-pack/heartbeat/monitors/browser/source/project_test.go
@@ -1,8 +1,6 @@
 // Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
-//go:build linux || darwin
-// +build linux darwin
 
 package source
 

diff --git a/x-pack/heartbeat/monitors/browser/source/source.go b/x-pack/heartbeat/monitors/browser/source/source.go
@@ -1,7 +1,6 @@
 // Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
-
 //go:build linux || darwin
 // +build linux darwin
 

diff --git a/x-pack/heartbeat/monitors/browser/source/validatepackage.go b/x-pack/heartbeat/monitors/browser/source/validatepackage.go
@@ -2,9 +2,6 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-//go:build linux || darwin
-// +build linux darwin
-
 package source
 
 import (

diff --git a/x-pack/heartbeat/monitors/browser/source/validatepackage_test.go b/x-pack/heartbeat/monitors/browser/source/validatepackage_test.go
@@ -2,9 +2,6 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-//go:build linux || darwin
-// +build linux darwin
-
 package source
 
 import (

diff --git a/x-pack/heartbeat/monitors/browser/source/zipurl.go b/x-pack/heartbeat/monitors/browser/source/zipurl.go
@@ -2,9 +2,6 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-//go:build linux || darwin
-// +build linux darwin
-
 package source
 
 import (

diff --git a/x-pack/heartbeat/monitors/browser/source/zipurl_test.go b/x-pack/heartbeat/monitors/browser/source/zipurl_test.go
@@ -2,9 +2,6 @@
 // or more contributor license agreements. Licensed under the Elastic License;
 // you may not use this file except in compliance with the Elastic License.
 
-//go:build linux || darwin
-// +build linux darwin
-
 package source
 
 import (

diff --git a/x-pack/heartbeat/scenarios/basics_test.go b/x-pack/heartbeat/scenarios/basics_test.go
@@ -17,6 +17,7 @@ import (
 	_ "github.com/elastic/beats/v7/heartbeat/monitors/active/http"
 	_ "github.com/elastic/beats/v7/heartbeat/monitors/active/icmp"
 	_ "github.com/elastic/beats/v7/heartbeat/monitors/active/tcp"
+	_ "github.com/elastic/beats/v7/x-pack/heartbeat/monitors/browser"
 )
 
 func TestSimpleScenariosBasicFields(t *testing.T) {

diff --git a/x-pack/heartbeat/scenarios/scenarios.go b/x-pack/heartbeat/scenarios/scenarios.go
@@ -8,6 +8,7 @@ import (
 	"fmt"
 	"net/http/httptest"
 	"net/url"
+	"os"
 	"sync"
 
 	"github.com/elastic/elastic-agent-libs/mapstr"
@@ -69,5 +70,30 @@ var Scenarios = &ScenarioDB{
 				}, func() {}, nil
 			},
 		},
+		{
+			Name: "simple-browser",
+			Type: "browser",
+			Tags: []string{"browser", "browser-inline"},
+			Runner: func() (config mapstr.M, close func(), err error) {
+				err = os.Setenv("ELASTIC_SYNTHETICS_CAPABLE", "true")
+				if err != nil {
+					return nil, nil, err
+				}
+				server := httptest.NewServer(hbtest.HelloWorldHandler(200))
+				config = mapstr.M{
+					"id":       "browser-test-id",
+					"name":     "browser-test-name",
+					"type":     "browser",
+					"schedule": "@every 1m",
+					"hosts":    []string{"127.0.0.1"},
+					"source": mapstr.M{
+						"inline": mapstr.M{
+							"script": fmt.Sprintf("step('load server', async () => {await page.goto('%s')})", server.URL),
+						},
+					},
+				}
+				return config, server.Close, nil
+			},
+		},
 	},
 }