This is an automated email from the ASF dual-hosted git repository.
mapohl pushed a commit to branch release-1.18
in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/release-1.18 by this push:
new 0293639170b Revert "[FLINK-34331][ci] Adds reusable workflow that is
used to load the runner configuration based on the projects owner"
0293639170b is described below
commit 0293639170b85720003faa2aacc0d4f1d127b8f4
Author: Matthias Pohl <[email protected]>
AuthorDate: Wed Feb 21 14:40:25 2024 +0100
Revert "[FLINK-34331][ci] Adds reusable workflow that is used to load the
runner configuration based on the projects owner"
This reverts commit b1aa03a28c0f14a8ca158a02a9c0d036aad7675c.
---
.github/workflows/template.flink-ci.yml | 19 ++++------
.github/workflows/template.pre-compile-checks.yml | 7 +---
.github/workflows/template.workflow-init.yml | 45 -----------------------
3 files changed, 8 insertions(+), 63 deletions(-)
diff --git a/.github/workflows/template.flink-ci.yml
b/.github/workflows/template.flink-ci.yml
index 088e3ea77cf..1ac63916ddd 100644
--- a/.github/workflows/template.flink-ci.yml
+++ b/.github/workflows/template.flink-ci.yml
@@ -68,14 +68,9 @@ env:
DOCKER_IMAGES_CACHE_FOLDER: /root/.docker-cache
jobs:
- workflow-init:
- name: "Initialize Workflow"
- uses: ./.github/workflows/template.workflow-init.yml
-
compile:
name: "Compile"
- needs: workflow-init
- runs-on: ${{ fromJSON( needs.workflow-init.outputs.runner_config ) }}
+ runs-on: ubuntu-22.04
container:
image: mapohl/flink-ci:FLINK-34194
# --init makes the process in the container being started as an init
process which will clean up any daemon processes during shutdown
@@ -135,8 +130,8 @@ jobs:
packaging:
name: "Test packaging/licensing"
- needs: [compile, workflow-init]
- runs-on: ${{ fromJSON( needs.workflow-init.outputs.runner_config ) }}
+ needs: compile
+ runs-on: ubuntu-22.04
container:
image: mapohl/flink-ci:FLINK-34194
# --init makes the process in the container being started as an init
process which will clean up any daemon processes during shutdown
@@ -175,8 +170,8 @@ jobs:
test:
name: "Test (module: ${{ matrix.module }})"
- needs: [compile, workflow-init]
- runs-on: ${{ fromJSON( needs.workflow-init.outputs.runner_config ) }}
+ needs: compile
+ runs-on: ubuntu-22.04
container:
image: mapohl/flink-ci:FLINK-34194
# --init makes the process in the container being started as an init
process which will clean up any daemon processes during shutdown
@@ -288,9 +283,9 @@ jobs:
e2e:
name: "E2E (group ${{ matrix.group }})"
+ needs: compile
# the end to end tests are not executed in Flink's CI Docker container due
to problems when running Docker-in-Docker
- needs: [compile, workflow-init]
- runs-on: ${{ fromJSON( needs.workflow-init.outputs.runner_config ) }}
+ runs-on: ubuntu-22.04
timeout-minutes: 310
env:
# timeout in minutes - this environment variable is required by
uploading_watchdog.sh
diff --git a/.github/workflows/template.pre-compile-checks.yml
b/.github/workflows/template.pre-compile-checks.yml
index 6ec4ebaafa8..94fcafb26fd 100644
--- a/.github/workflows/template.pre-compile-checks.yml
+++ b/.github/workflows/template.pre-compile-checks.yml
@@ -39,14 +39,9 @@ permissions: read-all
# This workflow should only contain steps that do not require the compilation
of Flink (and therefore, are
# independent of the used JDK)
jobs:
- workflow-init:
- name: "Initialize Workflow"
- uses: ./.github/workflows/template.workflow-init.yml
-
qa:
name: "Basic QA"
- needs: workflow-init
- runs-on: ${{ fromJSON( needs.workflow-init.outputs.runner_config ) }}
+ runs-on: ubuntu-22.04
container:
image: mapohl/flink-ci:FLINK-34194
# --init makes the process in the container being started as an init
process which will clean up any daemon processes during shutdown
diff --git a/.github/workflows/template.workflow-init.yml
b/.github/workflows/template.workflow-init.yml
deleted file mode 100644
index 74b6752646f..00000000000
--- a/.github/workflows/template.workflow-init.yml
+++ /dev/null
@@ -1,45 +0,0 @@
-# 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.
-
-name: "Apache Flink Workflow Initialization"
-
-on:
- workflow_call:
- outputs:
- runner_config:
- description: "The runs-on configuration that can be used in the
runs-on parameter."
- value: ${{ jobs.workflow_init.outputs.runner_config }}
-
-permissions: read-all
-
-jobs:
- workflow_init:
- name: "Initialize Workflow"
- # no need to fix a specific ubuntu version here because the workflow only
- # runs shell scripts that do not require dependency stability
- runs-on: ubuntu-latest
- outputs:
- runner_config: ${{ steps.runner_config_provider.outputs.runner_config }}
- steps:
- - name: "Determine runner configuration"
- id: runner_config_provider
- shell: bash
- run: |
- runner_config_value="\"ubuntu-22.04\""
- if [[ "${GITHUB_REPOSITORY_OWNER}" == "apache" ]]; then
- runner_config_value='["self-hosted", "asf-runner"]'
- fi
-
- echo "runner_config=${runner_config_value}" >> "${GITHUB_OUTPUT}"
