add entries to e2e-test.yaml & refactor <feature>/ directory

.github/workflows/e2e-test.yaml

@@ -18,8 +18,14 @@
 
 name: E2E Test
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
+
 on:
   pull_request:
+    branches:
+      - main
 
 jobs:
   build:

test/e2e/e2e.yaml

@@ -40,9 +40,9 @@ verify:
 
   cases:
     - name: fail-fast
-      query: './bin/linux/e2e verify -c  ./test/e2e/fail-fast/verify.yaml --summary-only -o yaml'
-      expected: ./fail-fast/internal/expected.yaml
+      query: './bin/linux/e2e verify -c  ./test/e2e/fail-fast/internal/verify.yaml --summary-only -o yaml'
+      expected: ./fail-fast/expected.yaml
 
     - name: non-fail-fast
-      query: './bin/linux/e2e verify -c  ./test/e2e/non-fail-fast/verify.yaml --summary-only -o yaml'
-      expected: ./non-fail-fast/internal/expected.yaml
+      query: './bin/linux/e2e verify -c  ./test/e2e/non-fail-fast/internal/verify.yaml --summary-only -o yaml'
+      expected: ./non-fail-fast/expected.yaml

test/e2e/fail-fast/expected.yaml

@@ -1,25 +1,23 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
+# Licensed to Apache Software Foundation (ASF) under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Apache Software Foundation (ASF) licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
-# This file is used to show how to write configuration files and can be used to test.
-
-args:
-    case: success
-headers:
-    Accept: application/json
-    Host: 127.0.0.1:8080
-    User-Agent: curl/7.81.0
-origin: 172.18.0.1
-url: http://127.0.0.1:8080/get?case=success
+passed:
+- case-1
+- case-2
+failed:
+- case-3
+skipped: []

test/e2e/fail-fast/internal/expected.yaml

@@ -1,23 +1,25 @@
-# Licensed to Apache Software Foundation (ASF) under one or more contributor
-# license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright
-# ownership. Apache Software Foundation (ASF) licenses this file to you under
-# the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-passed:
-- case-1
-- case-2
-failed:
-- case-3
-skipped: []
+# This file is used to show how to write configuration files and can be used to test.
+
+args:
+    case: success
+headers:
+    Accept: application/json
+    Host: 127.0.0.1:8080
+    User-Agent: curl/7.81.0
+origin: 172.18.0.1
+url: http://127.0.0.1:8080/get?case=success

test/e2e/non-fail-fast/expected.yaml

@@ -1,25 +1,24 @@
-# Licensed to the Apache Software Foundation (ASF) under one or more
-# contributor license agreements.  See the NOTICE file distributed with
-# this work for additional information regarding copyright ownership.
-# The ASF licenses this file to You under the Apache License, Version 2.0
-# (the "License"); you may not use this file except in compliance with
-# the License.  You may obtain a copy of the License at
+# Licensed to Apache Software Foundation (ASF) under one or more contributor
+# license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright
+# ownership. Apache Software Foundation (ASF) licenses this file to you under
+# the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License.
+# You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
 
-# This file is used to show how to write configuration files and can be used to test.
-
-args:
-    case: success
-headers:
-    Accept: application/json
-    Host: 127.0.0.1:8080
-    User-Agent: curl/7.81.0
-origin: 172.18.0.1
-url: http://127.0.0.1:8080/get?case=success
+passed:
+- case-1
+- case-2
+- case-4
+failed:
+- case-3
+skipped: []

test/e2e/non-fail-fast/internal/expected.yaml

@@ -1,24 +1,25 @@
-# Licensed to Apache Software Foundation (ASF) under one or more contributor
-# license agreements. See the NOTICE file distributed with
-# this work for additional information regarding copyright
-# ownership. Apache Software Foundation (ASF) licenses this file to you under
-# the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License.
-# You may obtain a copy of the License at
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
-passed:
-- case-1
-- case-2
-- case-4
-failed:
-- case-3
-skipped: []
+# This file is used to show how to write configuration files and can be used to test.
+
+args:
+    case: success
+headers:
+    Accept: application/json
+    Host: 127.0.0.1:8080
+    User-Agent: curl/7.81.0
+origin: 172.18.0.1
+url: http://127.0.0.1:8080/get?case=success