[Addon] Refactor addon tests CI workflow (#410)

* test changed files Signed-off-by: 楚岳 <[email protected]> add changed files action Signed-off-by: 楚岳 <[email protected]> fix path Signed-off-by: 楚岳 <[email protected]> more tests Signed-off-by: 楚岳 <[email protected]> add 1 Signed-off-by: 楚岳 <[email protected]> push finish work let test Signed-off-by: 楚岳 <[email protected]> delelte uesless file Signed-off-by: 楚岳 <[email protected]> fix Signed-off-by: 楚岳 <[email protected]> fix Signed-off-by: 楚岳 <[email protected]> fix Signed-off-by: 楚岳 <[email protected]> add pending addon Signed-off-by: 楚岳 <[email protected]> fix tests Signed-off-by: 楚岳 <[email protected]> add commnets Signed-off-by: 楚岳 <[email protected]> add test Signed-off-by: 楚岳 <[email protected]> more fix Signed-off-by: 楚岳 <[email protected]> add more tests Signed-off-by: 楚岳 <[email protected]> add more tests Signed-off-by: 楚岳 <[email protected]> add test utils Signed-off-by: 楚岳 <[email protected]> add commnets Signed-off-by: 楚岳 <[email protected]> add more test Signed-off-by: 楚岳 <[email protected]> fix flink Signed-off-by: 楚岳 <[email protected]> fix istio Signed-off-by: 楚岳 <[email protected]> consider downStream addon Signed-off-by: 楚岳 <[email protected]> check semver Signed-off-by: 楚岳 <[email protected]> fix makefile Signed-off-by: 楚岳 <[email protected]> * fix workflow Signed-off-by: 楚岳 <[email protected]>
kubevela · Jul 18, 2022 · 39796f1 · 39796f1
1 parent 9518283
commit 39796f1
Show file tree

Hide file tree

Showing 9 changed files with 352 additions and 10 deletions.
diff --git a/.github/workflows/addon-test.yaml b/.github/workflows/addon-test.yaml
@@ -43,6 +43,10 @@ jobs:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v2
 
+      - name: Check addon semver
+        run: |
+          make check-addon-semver
+
       - name: Install ginkgo
         run:  |
           sudo apt-get update
@@ -84,9 +88,19 @@ jobs:
           vela cluster join /tmp/worker.kubeconfig --name worker
           vela cluster list
 
+      - name: Get changed files
+        id: changed-files
+        uses: tj-actions/[email protected]
+
+      - name: List all changed files
+        run: |
+            for file in ${{ steps.changed-files.outputs.all_changed_files }}; do
+              echo "$file was changed"
+            done
+
       - name: Addon e2e-test
         run: |
-          make addon-test
+          go run test/e2e-test/addon-test/main.go  ${{ steps.changed-files.outputs.all_changed_files }}
 
 
 

diff --git a/Makefile b/Makefile
@@ -19,9 +19,9 @@ standard-metrics-test:
 standard-autoscaler-test:
 	cd ./traits/autoscalertrait && make test
 
-addon-test:
+check-addon-semver:
 	bash ./test/e2e-test/hack/check-semver.sh
-	bash ./test/e2e-test/hack/addon-vela-test.sh
+
 
 terraform-addon-gen:
 	go run hack/addons/terraform/gen.go
diff --git a/addons/flink-kubernetes-operator/definitions/flink-cluster.cue b/addons/flink-kubernetes-operator/definitions/flink-cluster.cue
@@ -1,9 +1,6 @@
 "flink-cluster": {
         annotations: {}
-        attributes: workload: definition: {
-                apiVersion: "flink.apache.org/v1alpha1"
-                kind:       "FlinkDeployment"
-        }
+        attributes: workload: type: "autodetects.core.oam.dev"
         description: "Flink Component."
         labels: {}
         type: "component"

diff --git a/...ental/addons/istio/resources/istio-vs.cue → ...tal/addons/istio/definitions/istio-vs.cue b/...ental/addons/istio/resources/istio-vs.cue → ...tal/addons/istio/definitions/istio-vs.cue
diff --git a/go.mod b/go.mod
@@ -3,17 +3,16 @@ module github.com/oam-dev/catalog
 go 1.17
 
 require (
+	github.com/Masterminds/semver/v3 v3.1.1
 	github.com/Masterminds/sprig/v3 v3.2.2
 	github.com/go-yaml/yaml v2.1.0+incompatible
-	golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449
 	helm.sh/helm/v3 v3.6.1
 	sigs.k8s.io/yaml v1.2.0
 )
 
 require (
 	github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 // indirect
 	github.com/Masterminds/goutils v1.1.1 // indirect
-	github.com/Masterminds/semver/v3 v3.1.1 // indirect
 	github.com/Microsoft/go-winio v0.4.16 // indirect
 	github.com/Microsoft/hcsshim v0.8.14 // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect

diff --git a/go.sum b/go.sum
@@ -779,7 +779,6 @@ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzB
 golang.org/x/mod v0.1.1-0.20191107180719-034126e5016b/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
 golang.org/x/mod v0.2.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/mod v0.3.0/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
-golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449 h1:xUIPaMhvROX9dhPvRCenIJtU78+lbEenGbgqB5hfHCQ=
 golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=

diff --git a/test/e2e-test/addon-test/go.mod b/test/e2e-test/addon-test/go.mod
@@ -0,0 +1,7 @@
+module github.com/oam-dev/catalog/test/e2e-test/addon-test
+
+go 1.17
+
+require sigs.k8s.io/yaml v1.3.0
+
+require gopkg.in/yaml.v2 v2.4.0 // indirect
diff --git a/test/e2e-test/addon-test/go.sum b/test/e2e-test/addon-test/go.sum
@@ -0,0 +1,6 @@
+github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
+gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+sigs.k8s.io/yaml v1.3.0 h1:a2VclLzOGrwOHDiV8EfBGhvjHvP46CtW5j6POvhYGGo=
+sigs.k8s.io/yaml v1.3.0/go.mod h1:GeOyir5tyXNByN85N/dRIT9es5UQNerPYEKK56eTBm8=