E2E: fix e2e and locking backend version (#161)

SkyAPM · Jun 3, 2022 · 6492c49 · 6492c49
1 parent 4aaa9a0
commit 6492c49
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Makefile b/Makefile
@@ -39,7 +39,7 @@ mock-gen:
 
 LINTER := bin/golangci-lint
 $(LINTER):
-	wget -q -O- https://install.goreleaser.com/github.com/golangci/golangci-lint.sh | sh -s v1.20.1
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s v1.20.1
 
 .PHONY: lint
 lint: $(LINTER) ./golangci.yml  ## Run the linters

diff --git a/test/e2e/cases/environment-variable/docker-compose.yml b/test/e2e/cases/environment-variable/docker-compose.yml
@@ -18,7 +18,7 @@ version: '2.1'
 
 services:
   oap:
-    image: ghcr.io/apache/skywalking/oap:latest
+    image: ghcr.io/apache/skywalking/oap:0447cb2b713c93c6a97b26ff59bdcea2fc9b8625 
     expose:
       - 11800
       - 12800

diff --git a/test/e2e/cases/environment-variable/expected/service.yml b/test/e2e/cases/environment-variable/expected/service.yml
@@ -17,6 +17,7 @@
 {{- contains . }}
 - id: {{ b64enc "app1" }}.1
   name: app1
+  normal: true
   group: ""
   shortname: app1
   layers:

diff --git a/test/e2e/cases/environment-variable/expected/traces-list-go.yml b/test/e2e/cases/environment-variable/expected/traces-list-go.yml
@@ -24,5 +24,4 @@ traces:
   iserror: false
   traceids:
     - {{ (index .traceids 0) }}
-  {{- end }}
-total: {{ gt .total 0 }}
+  {{- end }}
diff --git a/test/e2e/script/env b/test/e2e/script/env
@@ -12,4 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-SW_CTL_COMMIT=3278a47ab49e672f4ef7eb2ab5c806faf3c48dd5
+SW_CTL_COMMIT=46ca61b7604be7d327c4bbf19c895d520031d449
-Original file line number
+Diff line change
@@ Expand Up / @@ -18,7 +18,7 @@ version: '2.1' @@
     services:
       oap:
-        image: ghcr.io/apache/skywalking/oap:latest
+        image: ghcr.io/apache/skywalking/oap:0447cb2b713c93c6a97b26ff59bdcea2fc9b8625
         expose:
           - 11800
           - 12800
@@ Expand Down @@