diff --git a/.github/workflows/e2e-test.yaml b/.github/workflows/e2e-test.yaml index 6ce07be..a39c498 100644 --- a/.github/workflows/e2e-test.yaml +++ b/.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: diff --git a/test/e2e/e2e.yaml b/test/e2e/e2e.yaml index 08777a5..8d0b371 100644 --- a/test/e2e/e2e.yaml +++ b/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 \ No newline at end of file + query: './bin/linux/e2e verify -c ./test/e2e/non-fail-fast/internal/verify.yaml --summary-only -o yaml' + expected: ./non-fail-fast/expected.yaml \ No newline at end of file diff --git a/test/e2e/fail-fast/expected.yaml b/test/e2e/fail-fast/expected.yaml index 1d9d4bc..d7ea0a9 100644 --- a/test/e2e/fail-fast/expected.yaml +++ b/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 \ No newline at end of file +passed: +- case-1 +- case-2 +failed: +- case-3 +skipped: [] \ No newline at end of file diff --git a/test/e2e/fail-fast/internal/expected.yaml b/test/e2e/fail-fast/internal/expected.yaml index d7ea0a9..1d9d4bc 100644 --- a/test/e2e/fail-fast/internal/expected.yaml +++ b/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: [] \ No newline at end of file +# 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 \ No newline at end of file diff --git a/test/e2e/fail-fast/verify.yaml b/test/e2e/fail-fast/internal/verify.yaml similarity index 100% rename from test/e2e/fail-fast/verify.yaml rename to test/e2e/fail-fast/internal/verify.yaml diff --git a/test/e2e/non-fail-fast/expected.yaml b/test/e2e/non-fail-fast/expected.yaml index 1d9d4bc..a90d042 100644 --- a/test/e2e/non-fail-fast/expected.yaml +++ b/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 \ No newline at end of file +passed: +- case-1 +- case-2 +- case-4 +failed: +- case-3 +skipped: [] \ No newline at end of file diff --git a/test/e2e/non-fail-fast/internal/expected.yaml b/test/e2e/non-fail-fast/internal/expected.yaml index a90d042..1d9d4bc 100644 --- a/test/e2e/non-fail-fast/internal/expected.yaml +++ b/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: [] \ No newline at end of file +# 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 \ No newline at end of file diff --git a/test/e2e/non-fail-fast/verify.yaml b/test/e2e/non-fail-fast/internal/verify.yaml similarity index 100% rename from test/e2e/non-fail-fast/verify.yaml rename to test/e2e/non-fail-fast/internal/verify.yaml