combine declarative test cases into one test case (#60)

* combine tests into one test case Signed-off-by: Lize Cai <[email protected]>
OpenFunction · Aug 6, 2022 · da4e2ca · da4e2ca
1 parent 4b6d181
commit da4e2ca
Show file tree

Hide file tree

Showing 44 changed files with 133 additions and 1,065 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -47,14 +47,6 @@ jobs:
             e2e: "test/sync-http/e2e.yaml"
           - name: Sync Cloudevent e2e test
             e2e: "test/sync-cloudevent/e2e.yaml"
-          - name: Declarative Sync HTTP e2e test
-            e2e: "test/declarative/sync-http/e2e.yaml"
-          - name: Declarative Sync Cloudevent e2e test
-            e2e: "test/declarative/sync-cloudevent/e2e.yaml"
-          - name: Declarative multiple Sync HTTP e2e test
-            e2e: "test/declarative/sync-http-multiple/e2e.yaml"
-          - name: Declarative multiple Sync Cloudevent e2e test
-            e2e: "test/declarative/sync-cloudevent-multiple/e2e.yaml"
           - name: Declarative multiple functions with variables e2e test
             e2e: "test/declarative/sync-http-variables/e2e.yaml"
     steps:

diff --git a/plugin/skywalking/test/binding-event/e2e.yaml b/plugin/skywalking/test/binding-event/e2e.yaml
@@ -5,7 +5,13 @@ setup:
     - name: install dapr
       command: |
         dapr -v || (wget -q https://raw.githubusercontent.com/dapr/cli/master/install/install.sh -O - | /bin/bash)
-        dapr init -k --log-as-json
+        dapr init -k --runtime-version 1.8.1 --log-as-json --wait --timeout 600
+      wait:
+        - namespace: dapr-system
+          resource: pod
+          label-selector: app.kubernetes.io/name=dapr
+          for: condition=Ready
+
     - name: install helm
       command: |
         curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash

diff --git a/plugin/skywalking/test/topic-event/e2e.yaml b/plugin/skywalking/test/topic-event/e2e.yaml
@@ -5,7 +5,13 @@ setup:
     - name: install dapr
       command: |
         dapr -v || (wget -q https://raw.githubusercontent.com/dapr/cli/master/install/install.sh -O - | /bin/bash)
-        dapr init -k --log-as-json
+        dapr init -k --runtime-version 1.8.1 --log-as-json --wait --timeout 600
+      wait:
+        - namespace: dapr-system
+          resource: pod
+          label-selector: app.kubernetes.io/name=dapr
+          for: condition=Ready
+
     - name: install helm
       command: |
         curl https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 | bash

diff --git a/test/bindings/e2e.yaml b/test/bindings/e2e.yaml
@@ -5,7 +5,12 @@ setup:
     - name: install dapr
       command: |
         dapr -v || (wget -q https://raw.githubusercontent.com/dapr/cli/master/install/install.sh -O - | /bin/bash)
-        dapr init -k --log-as-json
+        dapr init -k --runtime-version 1.8.1 --log-as-json --wait --timeout 600
+      wait:
+        - namespace: dapr-system
+          resource: pod
+          label-selector: app.kubernetes.io/name=dapr
+          for: condition=Ready
 
     - name: install helm
       command: |

diff --git a/test/bindings/sender/Dockerfile.bindings.sender b/test/bindings/sender/Dockerfile.bindings.sender
@@ -1,4 +1,4 @@
-FROM golang:1.16-alpine
+FROM golang:1.17
 
 ENV GO111MODULE=on
 ENV GOPROXY=https://goproxy.cn,direct

diff --git a/test/bindings/target/Dockerfile.bindings.target b/test/bindings/target/Dockerfile.bindings.target
@@ -1,4 +1,4 @@
-FROM golang:1.16-alpine
+FROM golang:1.17
 
 ENV GO111MODULE=on
 ENV GOPROXY=https://goproxy.cn,direct

diff --git a/test/declarative/sync-cloudevent-multiple/Dockerfile.sync.cloudevent b/test/declarative/sync-cloudevent-multiple/Dockerfile.sync.cloudevent
diff --git a/test/declarative/sync-cloudevent-multiple/cloudevent.go b/test/declarative/sync-cloudevent-multiple/cloudevent.go
diff --git a/test/declarative/sync-cloudevent-multiple/e2e.yaml b/test/declarative/sync-cloudevent-multiple/e2e.yaml
diff --git a/test/declarative/sync-cloudevent-multiple/expected.data.yaml b/test/declarative/sync-cloudevent-multiple/expected.data.yaml
diff --git a/test/declarative/sync-cloudevent-multiple/main.go b/test/declarative/sync-cloudevent-multiple/main.go
diff --git a/test/declarative/sync-cloudevent-multiple/manifests.yaml b/test/declarative/sync-cloudevent-multiple/manifests.yaml
diff --git a/test/declarative/sync-cloudevent-multiple/verify.sh b/test/declarative/sync-cloudevent-multiple/verify.sh
diff --git a/test/declarative/sync-cloudevent/Dockerfile.sync.cloudevent b/test/declarative/sync-cloudevent/Dockerfile.sync.cloudevent
diff --git a/test/declarative/sync-cloudevent/cloudevent.go b/test/declarative/sync-cloudevent/cloudevent.go