This is an automated email from the ASF dual-hosted git repository.
wusheng pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/skywalking-rover.git
The following commit(s) were added to refs/heads/main by this push:
new 6dad4c2 Active the GHA (#31)
6dad4c2 is described below
commit 6dad4c290a03662cfb9261db03398d27e6fef460
Author: mrproliu <[email protected]>
AuthorDate: Mon May 16 17:49:40 2022 +0800
Active the GHA (#31)
---
.github/workflows/rover.yaml | 7 +++----
test/e2e/base/base-compose.yml | 2 +-
test/e2e/base/env | 3 ++-
test/e2e/cases/process/agent_sensor/golang/expected/instance.yml | 1 -
test/e2e/cases/process/agent_sensor/golang/expected/process.yml | 1 -
test/e2e/cases/process/istio/e2e.yaml | 4 ++--
test/e2e/cases/process/istio/expected/process.yml | 3 ---
test/e2e/cases/process/istio/expected/service-instance.yml | 1 -
test/e2e/cases/profiling/expected/instance.yml | 1 -
test/e2e/cases/profiling/expected/process.yml | 1 -
test/e2e/cases/profiling/expected/profiling-schedule-list.yml | 1 -
11 files changed, 8 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/rover.yaml b/.github/workflows/rover.yaml
index 68113bb..11c2784 100644
--- a/.github/workflows/rover.yaml
+++ b/.github/workflows/rover.yaml
@@ -67,7 +67,6 @@ jobs:
e2e-test:
name: E2E test
needs: [ docker ]
- if: ${{ false }} # disable for temporary, it would activate after OAP
side finished
runs-on: ubuntu-latest
timeout-minutes: 60
strategy:
@@ -146,6 +145,6 @@ jobs:
if [[ ${{ needs.build.result }} != 'success' ]]; then
exit -1
fi
-# if [[ ${{ needs.e2e-test.result }} != 'success' ]]; then
-# exit -1
-# fi
\ No newline at end of file
+ if [[ ${{ needs.e2e-test.result }} != 'success' ]]; then
+ exit -1
+ fi
\ No newline at end of file
diff --git a/test/e2e/base/base-compose.yml b/test/e2e/base/base-compose.yml
index 52c456a..d3b13cb 100644
--- a/test/e2e/base/base-compose.yml
+++ b/test/e2e/base/base-compose.yml
@@ -17,7 +17,7 @@ version: '2.1'
services:
oap:
- image:
ghcr.io/apache/skywalking/oap:a3e14bdc7adddd940f23b394672c4b685e6737fe
+ image: ghcr.io/apache/skywalking/oap:${SW_OAP_COMMIT}
expose:
- 11800
- 12800
diff --git a/test/e2e/base/env b/test/e2e/base/env
index 9154c68..f07f319 100644
--- a/test/e2e/base/env
+++ b/test/e2e/base/env
@@ -13,7 +13,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-SW_CTL_COMMIT=5a62c2e029e17234e6bbad18ced0ce31d0f67ce9
+SW_CTL_COMMIT=03dbdcf8cecc3abdef661efaa5734c01ac49adea
+SW_OAP_COMMIT=91b94cfc105276897c82e2d0f8d4bb8bd3952660
SW_KUBERNETES_COMMIT_SHA=0f3ec68e5a7e1608cec8688716b848ed15e971e5
SW_AGENT_GO_COMMIT=216f122d942cb683f48578d3014cc5ea83637582
\ No newline at end of file
diff --git a/test/e2e/cases/process/agent_sensor/golang/expected/instance.yml
b/test/e2e/cases/process/agent_sensor/golang/expected/instance.yml
index 9c86379..8d76343 100644
--- a/test/e2e/cases/process/agent_sensor/golang/expected/instance.yml
+++ b/test/e2e/cases/process/agent_sensor/golang/expected/instance.yml
@@ -31,5 +31,4 @@
{{- end }}
language: GO
instanceuuid: {{ notEmpty .instanceuuid }}
- layer: GENERAL
{{- end }}
\ No newline at end of file
diff --git a/test/e2e/cases/process/agent_sensor/golang/expected/process.yml
b/test/e2e/cases/process/agent_sensor/golang/expected/process.yml
index f116332..959009c 100644
--- a/test/e2e/cases/process/agent_sensor/golang/expected/process.yml
+++ b/test/e2e/cases/process/agent_sensor/golang/expected/process.yml
@@ -20,7 +20,6 @@
servicename: go2sky
instanceid: {{ b64enc "go2sky" }}.1_{{ b64enc "go2sky-instance" }}
instancename: go2sky-instance
- layer: GENERAL
agentid: {{ notEmpty .agentid }}
detecttype: VM
attributes:
diff --git a/test/e2e/cases/process/istio/e2e.yaml
b/test/e2e/cases/process/istio/e2e.yaml
index 33b8044..e29ae98 100644
--- a/test/e2e/cases/process/istio/e2e.yaml
+++ b/test/e2e/cases/process/istio/e2e.yaml
@@ -54,8 +54,8 @@ setup:
--set elasticsearch.imageTag=7.5.1 \
--set oap.replicas=1 \
--set ui.image.repository=ghcr.io/apache/skywalking/ui \
- --set
ui.image.tag=a3e14bdc7adddd940f23b394672c4b685e6737fe \
- --set
oap.image.tag=a3e14bdc7adddd940f23b394672c4b685e6737fe \
+ --set ui.image.tag=${SW_OAP_COMMIT} \
+ --set oap.image.tag=${SW_OAP_COMMIT} \
--set
oap.image.repository=ghcr.io/apache/skywalking/oap \
--set oap.storageType=elasticsearch
wait:
diff --git a/test/e2e/cases/process/istio/expected/process.yml
b/test/e2e/cases/process/istio/expected/process.yml
index 645b266..72292c5 100644
--- a/test/e2e/cases/process/istio/expected/process.yml
+++ b/test/e2e/cases/process/istio/expected/process.yml
@@ -20,7 +20,6 @@
servicename: default::productpage
instanceid: {{ notEmpty .instanceid }}
instancename: {{ notEmpty .instancename }}
- layer: MESH
agentid: {{ notEmpty .agentid }}
detecttype: KUBERNETES
attributes:
@@ -44,7 +43,6 @@
servicename: default::productpage
instanceid: {{ notEmpty .instanceid }}
instancename: {{ notEmpty .instancename }}
- layer: MESH_DP
agentid: {{ notEmpty .agentid }}
detecttype: KUBERNETES
attributes:
@@ -68,7 +66,6 @@
servicename: default::productpage
instanceid: {{ notEmpty .instanceid }}
instancename: {{ notEmpty .instancename }}
- layer: MESH_DP
agentid: {{ notEmpty .agentid }}
detecttype: KUBERNETES
attributes:
diff --git a/test/e2e/cases/process/istio/expected/service-instance.yml
b/test/e2e/cases/process/istio/expected/service-instance.yml
index 1d6d6bc..658cdbd 100644
--- a/test/e2e/cases/process/istio/expected/service-instance.yml
+++ b/test/e2e/cases/process/istio/expected/service-instance.yml
@@ -19,5 +19,4 @@
attributes: []
language: UNKNOWN
instanceuuid: {{ notEmpty .instanceuuid }}
- layer: {{ notEmpty .layer }}
{{- end }}
diff --git a/test/e2e/cases/profiling/expected/instance.yml
b/test/e2e/cases/profiling/expected/instance.yml
index b5c287a..7f86905 100644
--- a/test/e2e/cases/profiling/expected/instance.yml
+++ b/test/e2e/cases/profiling/expected/instance.yml
@@ -19,5 +19,4 @@
attributes: []
language: UNKNOWN
instanceuuid: {{ notEmpty .instanceuuid }}
- layer: OS_LINUX
{{- end }}
\ No newline at end of file
diff --git a/test/e2e/cases/profiling/expected/process.yml
b/test/e2e/cases/profiling/expected/process.yml
index 31fac87..02e62c0 100644
--- a/test/e2e/cases/profiling/expected/process.yml
+++ b/test/e2e/cases/profiling/expected/process.yml
@@ -20,7 +20,6 @@
servicename: sqrt
instanceid: {{ b64enc "sqrt" }}.1_{{ b64enc "test-instance" }}
instancename: test-instance
- layer: OS_LINUX
agentid: {{ notEmpty .agentid }}
detecttype: VM
attributes:
diff --git a/test/e2e/cases/profiling/expected/profiling-schedule-list.yml
b/test/e2e/cases/profiling/expected/profiling-schedule-list.yml
index e19b699..0127ebf 100644
--- a/test/e2e/cases/profiling/expected/profiling-schedule-list.yml
+++ b/test/e2e/cases/profiling/expected/profiling-schedule-list.yml
@@ -23,7 +23,6 @@
servicename: sqrt
instanceid: {{ b64enc "sqrt" }}.1_{{ b64enc "test-instance" }}
instancename: test-instance
- layer: OS_LINUX
agentid: {{ notEmpty .process.agentid }}
detecttype: VM
attributes:
