Skip to content

Commit

Permalink
Merge branch 'trunk' into renovate/postgresql-16.x
Browse files Browse the repository at this point in the history
  • Loading branch information
VietND96 authored Dec 25, 2024
2 parents 278f641 + a841309 commit b5913e1
Show file tree
Hide file tree
Showing 30 changed files with 349 additions and 179 deletions.
2 changes: 2 additions & 0 deletions .ffmpeg/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ ARG VERSION_FFMPEG="7.1"
ARG VERSION_RCLONE="v1.68.2"
ARG VERSION_GO="latest"
ARG GO_CRYPTO_VERSION="v0.31.0"
ARG GO_NET_VERSION="v0.33.0"

USER root

Expand Down Expand Up @@ -33,6 +34,7 @@ RUN cd /usr/local/src \
&& git checkout $VERSION_RCLONE \
# Patch deps version in go.mod to fix CVEs
&& sed -i "s|golang.org/x/crypto v.*|golang.org/x/crypto ${GO_CRYPTO_VERSION}|g" go.mod \
&& sed -i "s|golang.org/x/net v.*|golang.org/x/net ${GO_NET_VERSION}|g" go.mod \
&& go mod tidy \
# Build rclone
&& make \
Expand Down
2 changes: 2 additions & 0 deletions .github/workflows/build-ffmpeg.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ name: Build and Deploy FFmpeg

on:
push:
branches:
- trunk
paths:
- '.ffmpeg/Dockerfile'
pull_request:
Expand Down
10 changes: 10 additions & 0 deletions .github/workflows/build-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,19 @@ on:
type: boolean
default: true
push:
branches:
- trunk
paths-ignore:
- '**.md'
- '.*'
pull_request:
paths-ignore:
- '**.md'

concurrency:
group: ${{ github.workflow }}-${{ github.ref == github.ref_protected && github.run_id || github.event.pull_request.number || github.ref }}
cancel-in-progress: true

permissions: write-all

env:
Expand All @@ -33,14 +40,17 @@ env:

jobs:
docker-test:
if: contains(toJson(github.event.commits), '[skip test]') == false
name: Test Seleium Grid on Docker
uses: ./.github/workflows/docker-test.yml
with:
release: ${{ inputs.release == 'true' }}

helm-chart-test:
if: contains(toJson(github.event.commits), '[skip test]') == false
name: Test Selenium Grid on Kubernetes
uses: ./.github/workflows/helm-chart-test.yml
secrets: inherit
with:
release: ${{ inputs.release == 'true' }}

Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
deploy:
needs:
- build-test
if: (contains(toJson(github.event.commits), '[deploy]') || (github.event_name == 'workflow_dispatch' && github.event.inputs.release == 'true')) && !failure() && !cancelled()
if: (contains(toJson(github.event.commits), '[deploy]') == true || (github.event_name == 'workflow_dispatch' && github.event.inputs.release == 'true')) && !failure() && !cancelled()
name: Deploy and Release
runs-on: blacksmith-8vcpu-ubuntu-2204
permissions: write-all
Expand Down Expand Up @@ -174,7 +174,7 @@ jobs:
run: |
git config --local user.email "[email protected]"
git config --local user.name "Selenium CI Bot"
git commit -m "Update tag ${RELEASE_TAG} in docs and files" -a
git commit -m "[ci] Update tag ${RELEASE_TAG} in docs and files" -m "[skip test]" -a
env:
RELEASE_TAG: "${{ env.GRID_VERSION }}-${{ env.BUILD_DATE }}"
- name: Push changes
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/helm-chart-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ env:

jobs:
helm-chart-test:
if: github.event.inputs.skip-test != 'true'
if: github.event.inputs.skip-test != 'true' && contains(toJson(github.event.commits), '[skip test]') == false
uses: ./.github/workflows/helm-chart-test.yml
with:
release: ${{ github.event.inputs.release == 'true' }}
Expand Down Expand Up @@ -114,7 +114,7 @@ jobs:
run: |
git config --local user.email "[email protected]"
git config --local user.name "Selenium CI Bot"
git commit -m "Update chart ${LATEST_CHART_VERSION} changelog [skip ci]" -a || true
git commit -m "[ci] Update chart ${LATEST_CHART_VERSION} changelog" -m "[skip ci]" -a || true
- name: Push changes
if: github.event.inputs.skip-commit != 'true'
Expand Down
11 changes: 10 additions & 1 deletion .github/workflows/helm-chart-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ name: Test Helm Charts

on:
workflow_call:
secrets:
DOCKER_USERNAME:
required: false
DOCKER_PASSWORD:
required: false
inputs:
release:
description: 'Test a new release process'
Expand Down Expand Up @@ -142,7 +147,6 @@ jobs:
- name: Sets build date
run: |
echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV
echo "IMAGE_REGISTRY=artifactory/selenium" >> $GITHUB_ENV
echo "AUTHORS=${AUTHORS}" >> $GITHUB_ENV
env:
AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
Expand All @@ -158,6 +162,11 @@ jobs:
max_attempts: 3
retry_wait_seconds: 60
command: NAME=${IMAGE_REGISTRY} VERSION=${BRANCH} BUILD_DATE=${BUILD_DATE} make build
- name: Login Docker Hub
run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
env:
DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
- name: Setup Kubernetes cluster
uses: nick-invision/retry@master
with:
Expand Down
17 changes: 15 additions & 2 deletions .github/workflows/k8s-scaling-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@ name: Test Grid Autoscaling in Kubernetes

on:
workflow_call:
secrets:
DOCKER_USERNAME:
required: false
DOCKER_PASSWORD:
required: false
inputs:
release:
description: 'Test a new release process'
Expand Down Expand Up @@ -36,6 +41,10 @@ on:
type: string
default: '20'

concurrency:
group: ${{ github.workflow }}-${{ github.ref == github.ref_protected && github.run_id || github.event.pull_request.number || github.ref }}
cancel-in-progress: true

permissions:
contents: write
pull-requests: write
Expand Down Expand Up @@ -135,10 +144,14 @@ jobs:
- name: Sets build date
run: |
echo "BUILD_DATE=$(date '+%Y%m%d')" >> $GITHUB_ENV
echo "IMAGE_REGISTRY=artifactory/selenium" >> $GITHUB_ENV
echo "AUTHORS=${AUTHORS}" >> $GITHUB_ENV
env:
AUTHORS: ${{ vars.AUTHORS || 'SeleniumHQ' }}
- name: Login Docker Hub
run: docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"
env:
DOCKER_USERNAME: ${{secrets.DOCKER_USERNAME}}
DOCKER_PASSWORD: ${{secrets.DOCKER_PASSWORD}}
- name: Setup Kubernetes cluster
uses: nick-invision/retry@master
with:
Expand Down Expand Up @@ -205,7 +218,7 @@ jobs:
git config --local user.email "[email protected]"
git config --local user.name "Selenium CI Bot"
git add .keda/.
git commit -m "[ci] Upload autoscaling in K8s test results [skip ci]" -a
git commit -m "[ci] Upload autoscaling in K8s test results" -m "[skip ci]" -a
- name: Push changes
uses: ad-m/github-push-action@master
with:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lock.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ name: 'Lock Issues'
on:
workflow_dispatch:
schedule:
- cron: '0 0 * * *'
- cron: '0 23 * * *'

permissions:
issues: write
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update-chart-readme.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
run: |
git config --local user.email "[email protected]"
git config --local user.name "Selenium CI Bot"
git commit -m "Update chart configuration table" -a
git commit -m "[ci] Update chart configuration table" -m "[skip test]" -a
- name: Push changes
if: env.diff == 'true'
uses: ad-m/github-push-action@master
Expand Down
6 changes: 5 additions & 1 deletion .keda/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,16 @@ You can involve to review and discuss the pull requests to help us early detect

[kedacore/keda](https://github.com/kedacore/keda)

- https://github.com/kedacore/keda/pull/6368
- ~~https://github.com/kedacore/keda/pull/6437 (merged, v2.16.1)~~

- ~~https://github.com/kedacore/keda/pull/6368 (merged, v2.16.1)~~

- ~~https://github.com/kedacore/keda/pull/6169 (merged, v2.16.0)~~

[kedacore/keda-docs](https://github.com/kedacore/keda-docs)

- https://github.com/kedacore/keda-docs/pull/1515

- ~~https://github.com/kedacore/keda-docs/pull/1468 (merged, v2.16.0)~~

# Test results of the patch scaler
Expand Down
40 changes: 20 additions & 20 deletions .keda/results_test_k8s_autoscaling_deployment_count.md
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
| Iteration | New request sessions | Sessions created time | Sessions failed to create | New pods scaled up | Total running sessions | Total running pods | Max sessions per pod | Gaps | Sessions closed |
| --------- | -------------------- | --------------------- | ------------------------- | ------------------ | ---------------------- | ------------------ | -------------------- | ---- | --------------- |
| 1 | 1 | 39.44 s | 0 | 1 | 1 | 1 | 1 | 0 | 1 |
| 2 | 2 | 39.77 s | 0 | 1 | 2 | 2 | 1 | 0 | 0 |
| 3 | 1 | 28.38 s | 0 | 1 | 3 | 3 | 1 | 0 | 0 |
| 4 | 2 | 54.92 s | 0 | 2 | 5 | 5 | 1 | 0 | 0 |
| 5 | 2 | 33.04 s | 0 | 2 | 7 | 7 | 1 | 0 | 0 |
| 6 | 1 | 29.43 s | 0 | 1 | 8 | 8 | 1 | 0 | 8 |
| 7 | 2 | 47.04 s | 0 | 1 | 2 | 9 | 1 | 7 | 0 |
| 8 | 2 | 43.42 s | 0 | 1 | 4 | 10 | 1 | 6 | 0 |
| 9 | 2 | 47.99 s | 0 | 0 | 6 | 10 | 1 | 4 | 0 |
| 10 | 3 | 44.97 s | 0 | 2 | 9 | 12 | 1 | 3 | 0 |
| 11 | 3 | 42.98 s | 0 | -2 | 12 | 10 | 1 | -2 | 12 |
| 12 | 1 | 4.52 s | 0 | 0 | 1 | 10 | 1 | 9 | 0 |
| 13 | 2 | 39.93 s | 0 | 1 | 3 | 11 | 1 | 8 | 0 |
| 14 | 1 | 29.45 s | 0 | 1 | 4 | 12 | 1 | 8 | 0 |
| 15 | 2 | 30.52 s | 0 | 1 | 6 | 13 | 1 | 7 | 0 |
| 16 | 3 | 35.62 s | 0 | 3 | 9 | 16 | 1 | 7 | 9 |
| 17 | 3 | 16.59 s | 0 | 0 | 3 | 16 | 1 | 13 | 0 |
| 18 | 3 | 36.76 s | 0 | 1 | 6 | 10 | 1 | 4 | 0 |
| 19 | 3 | 29.10 s | 0 | 1 | 9 | 11 | 1 | 2 | 0 |
| 20 | 3 | 51.36 s | 0 | 3 | 12 | 14 | 1 | 2 | 0 |
| 1 | 1 | 28.57 s | 0 | 1 | 1 | 1 | 1 | 0 | 1 |
| 2 | 1 | 5.10 s | 0 | 0 | 1 | 1 | 1 | 0 | 0 |
| 3 | 3 | 63.16 s | 0 | 3 | 4 | 4 | 1 | 0 | 0 |
| 4 | 1 | 35.54 s | 0 | 1 | 5 | 5 | 1 | 0 | 0 |
| 5 | 2 | 38.30 s | 0 | 2 | 7 | 7 | 1 | 0 | 0 |
| 6 | 1 | 44.21 s | 0 | 1 | 8 | 8 | 1 | 0 | 8 |
| 7 | 1 | 4.78 s | 0 | 0 | 1 | 8 | 1 | 7 | 0 |
| 8 | 2 | 40.11 s | 0 | 1 | 3 | 9 | 1 | 6 | 0 |
| 9 | 1 | 4.33 s | 0 | 0 | 4 | 9 | 1 | 5 | 0 |
| 10 | 1 | 40.46 s | 0 | 1 | 5 | 10 | 1 | 5 | 0 |
| 11 | 2 | 29.67 s | 0 | 1 | 7 | 11 | 1 | 4 | 7 |
| 12 | 2 | 12.27 s | 0 | 0 | 2 | 11 | 1 | 9 | 0 |
| 13 | 3 | 13.77 s | 0 | 0 | 5 | 11 | 1 | 6 | 0 |
| 14 | 2 | 6.81 s | 0 | 0 | 7 | 11 | 1 | 4 | 0 |
| 15 | 2 | 38.89 s | 0 | 1 | 9 | 10 | 1 | 1 | 0 |
| 16 | 1 | 36.10 s | 0 | 1 | 10 | 11 | 1 | 1 | 10 |
| 17 | 2 | 6.82 s | 0 | 0 | 2 | 11 | 1 | 9 | 0 |
| 18 | 1 | 4.88 s | 0 | 0 | 3 | 11 | 1 | 8 | 0 |
| 19 | 1 | 6.67 s | 0 | 0 | 4 | 11 | 1 | 7 | 0 |
| 20 | 2 | 6.87 s | 0 | 0 | 6 | 11 | 1 | 5 | 0 |
Loading

0 comments on commit b5913e1

Please sign in to comment.