Skip to content

Commit 85df55c

Browse files
committed
Update infra-e2e to dc2be59 and fix missed .yaml compose files
- Update SHA to include the fix that removes compose.Wait(true), which was causing failures for run-once/init containers that exit after completing (e.g., mongodb-repl-setup, load generators). - Remove version field from 2 missed .yaml compose files (the previous commit only handled .yml files).
1 parent 692e3a2 commit 85df55c

3 files changed

Lines changed: 5 additions & 9 deletions

File tree

.github/workflows/skywalking.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -769,7 +769,7 @@ jobs:
769769
if: matrix.test.docker != null
770770
run: docker build -t ${{ matrix.test.docker.name }} -f ${{ matrix.test.docker.base }}/${{ matrix.test.docker.file }} ${{ matrix.test.docker.base }}
771771
- name: ${{ matrix.test.name }}
772-
uses: apache/skywalking-infra-e2e@81adeecb3c8e5fcf77b36ec38671df1c44f36b17
772+
uses: apache/skywalking-infra-e2e@dc2be59a3eb6b8707d0fd8b8dc779e5fafffb24d
773773
with:
774774
e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
775775
- if: ${{ failure() }}
@@ -843,7 +843,7 @@ jobs:
843843
username: ${{ github.repository_owner }}
844844
password: ${{ secrets.GITHUB_TOKEN }}
845845
- name: ALS ${{ matrix.storage }}, ${{ matrix.analyzer }}, istio-${{ matrix.versions.istio }}, k8s-${{ matrix.versions.kubernetes }}
846-
uses: apache/skywalking-infra-e2e@81adeecb3c8e5fcf77b36ec38671df1c44f36b17
846+
uses: apache/skywalking-infra-e2e@dc2be59a3eb6b8707d0fd8b8dc779e5fafffb24d
847847
env:
848848
ISTIO_VERSION: ${{ matrix.versions.istio }}
849849
KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }}
@@ -915,7 +915,7 @@ jobs:
915915
username: ${{ github.repository_owner }}
916916
password: ${{ secrets.GITHUB_TOKEN }}
917917
- name: ${{ matrix.test.name }}
918-
uses: apache/skywalking-infra-e2e@81adeecb3c8e5fcf77b36ec38671df1c44f36b17
918+
uses: apache/skywalking-infra-e2e@dc2be59a3eb6b8707d0fd8b8dc779e5fafffb24d
919919
env:
920920
ISTIO_VERSION: ${{ matrix.versions.istio }}
921921
KUBERNETES_VERSION: ${{ matrix.versions.kubernetes }}
@@ -979,7 +979,7 @@ jobs:
979979
shell: bash
980980
run: ./mvnw -B -q -f test/e2e-v2/java-test-service/pom.xml clean package
981981
- name: Java version ${{ matrix.java-version }}
982-
uses: apache/skywalking-infra-e2e@81adeecb3c8e5fcf77b36ec38671df1c44f36b17
982+
uses: apache/skywalking-infra-e2e@dc2be59a3eb6b8707d0fd8b8dc779e5fafffb24d
983983
env:
984984
SW_AGENT_JDK_VERSION: ${{ matrix.java-version }}
985985
with:
@@ -1075,7 +1075,7 @@ jobs:
10751075
fi
10761076
docker compose -f ${BANYANDB_DATA_GENERATE_ROOT}/docker-compose.yml down -v
10771077
- name: ${{ matrix.test.name }}
1078-
uses: apache/skywalking-infra-e2e@81adeecb3c8e5fcf77b36ec38671df1c44f36b17
1078+
uses: apache/skywalking-infra-e2e@dc2be59a3eb6b8707d0fd8b8dc779e5fafffb24d
10791079
with:
10801080
e2e-file: $GITHUB_WORKSPACE/${{ matrix.test.config }}
10811081
- if: ${{ failure() }}

test/e2e-v2/cases/mariadb/mariadb-slowsql/docker-compose.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
version: '2.1'
17-
1816
services:
1917
oap:
2018
extends:

test/e2e-v2/cases/mysql/mysql-slowsql/docker-compose.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515

16-
version: '2.1'
17-
1816
services:
1917
oap:
2018
extends:

0 commit comments

Comments
 (0)