Skip to content

Commit

Permalink
Merge branch 'main' into kpr9
Browse files Browse the repository at this point in the history
  • Loading branch information
kostasrim committed Aug 26, 2024
2 parents 0f60fb8 + b7eccad commit 8b2703a
Show file tree
Hide file tree
Showing 153 changed files with 15,990 additions and 1,015 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ jobs:
EOF
gdb -ix ./init.gdb --batch -ex r --args ./dragonfly_test --force_epoll
FLAGS_force_epoll=true GLOG_vmodule=rdb_load=1,rdb_save=1,snapshot=1 timeout 20m ctest -V -L DFLY
DFLY_use_new_io=true FLAGS_force_epoll=true GLOG_vmodule=rdb_load=1,rdb_save=1,snapshot=1 timeout 20m ctest -V -L DFLY
echo "Finished running tests with --force_epoll"
Expand Down
149 changes: 149 additions & 0 deletions .github/workflows/test-fakeredis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
---
name: Test Dragonfly/Fakeredis

on:
workflow_dispatch:

concurrency:
group: dragon-fly-${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
test:
runs-on: ubuntu-latest
strategy:
fail-fast: false
matrix:
PYTHON_VERSION:
- "3.10"
DRAGONFLY_VERSION:
- "latest"
tests:
- "test_json"
- "test_mixins"
- "test_stack"
- "test_connection.py"
- "test_asyncredis.py"
- "test_general.py"
- "test_scan.py"
- "test_zadd.py"
- "test_translations.py"
- "test_sortedset_commands.py"
name: "Run tests: ${{ matrix.tests }}"
permissions:
pull-requests: write
services:
redis:
image: docker.dragonflydb.io/dragonflydb/dragonfly:${{ matrix.DRAGONFLY_VERSION }}
ports:
- 6380:6379
options: >-
--health-cmd "redis-cli ping"
--health-interval 10s
--health-timeout 5s
--health-retries 5
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
cache-dependency-path: tests/fakeredis/poetry.lock
python-version: ${{ matrix.PYTHON_VERSION }}

- name: Install dependencies
env:
PYTHON_KEYRING_BACKEND: keyring.backends.null.Keyring
shell: bash
working-directory: tests/fakeredis
run: |
python -m pip --quiet install poetry
echo "$HOME/.poetry/bin" >> $GITHUB_PATH
poetry install
- name: Run tests
working-directory: tests/fakeredis
run: |
poetry run pytest test/${{ matrix.tests }} \
--junit-xml=results-${{ matrix.tests }}.xml \
--html=report-${{ matrix.tests }}.html \
-v
- name: Upload Tests Result xml
if: always()
uses: actions/upload-artifact@v4
with:
name: tests-result-${{ matrix.tests }}.xml
path: tests/fakeredis/results-${{ matrix.tests }}.xml

- name: Upload Tests Result html
if: always()
uses: actions/upload-artifact@v4
with:
name: report-${{ matrix.tests }}.html
path: tests/fakeredis/report-${{ matrix.tests }}.html

publish-html-results:
name: Publish HTML Test Results to GitHub Pages
needs: test
if: always()
runs-on: ubuntu-latest
permissions:
pages: write # to deploy to Pages
id-token: write # to verify the deployment originates from an appropriate source
steps:
- name: Bundle Tests Result to one artifact
uses: actions/upload-artifact/merge@v4
with:
delete-merged: true
name: test-results-html
pattern: '*.html'

- name: Download html pages
uses: actions/download-artifact@v4
with:
name: test-results-html
path: results/

- uses: actions/setup-python@v5
with:
cache-dependency-path: tests/fakeredis/poetry.lock
python-version: "3.12"

- name: Merge html results
run: |
pip install pytest-html-merger
pytest_html_merger -i results/ -o results/index.html
- name: Publish to GitHub Pages
uses: actions/upload-pages-artifact@v3
with:
path: results/

- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v4
with:
token: '${{ secrets.GITHUB_TOKEN }}'

bundle-results-xml:
name: publish summary to workflow run
needs: test
if: always()
runs-on: ubuntu-latest
steps:
- name: Bundle Tests Result to one artifact
uses: actions/upload-artifact/merge@v4
with:
delete-merged: true
name: tests-result-xml
pattern: '*.xml'

- name: Download Tests Result
uses: actions/download-artifact@v4
with:
name: tests-result-xml

- name: Publish Test Report
uses: mikepenz/action-junit-report@v4
with:
report_paths: '*.xml'
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ _deps
releases
.DS_Store
.idea/*

.hypothesis
.secrets
4 changes: 2 additions & 2 deletions contrib/charts/dragonfly/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
version: v1.21.1
version: v1.21.4

# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
# follow Semantic Versioning. They should reflect the version the application is using.
# It is recommended to use it with quotes.
appVersion: "v1.21.1"
appVersion: "v1.21.4"

home: https://dragonflydb.io/

Expand Down
8 changes: 4 additions & 4 deletions contrib/charts/dragonfly/ci/affinity-values.golden.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
labels:
app.kubernetes.io/name: dragonfly
app.kubernetes.io/instance: test
app.kubernetes.io/version: "v1.21.1"
app.kubernetes.io/version: "v1.21.4"
app.kubernetes.io/managed-by: Helm
---
# Source: dragonfly/templates/service.yaml
Expand All @@ -20,7 +20,7 @@ metadata:
labels:
app.kubernetes.io/name: dragonfly
app.kubernetes.io/instance: test
app.kubernetes.io/version: "v1.21.1"
app.kubernetes.io/version: "v1.21.4"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
Expand All @@ -42,7 +42,7 @@ metadata:
labels:
app.kubernetes.io/name: dragonfly
app.kubernetes.io/instance: test
app.kubernetes.io/version: "v1.21.1"
app.kubernetes.io/version: "v1.21.4"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand Down Expand Up @@ -72,7 +72,7 @@ spec:
serviceAccountName: test-dragonfly
containers:
- name: dragonfly
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.21.1"
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.21.4"
imagePullPolicy: IfNotPresent
ports:
- name: dragonfly
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
labels:
app.kubernetes.io/name: dragonfly
app.kubernetes.io/instance: test
app.kubernetes.io/version: "v1.21.1"
app.kubernetes.io/version: "v1.21.4"
app.kubernetes.io/managed-by: Helm
---
# Source: dragonfly/templates/service.yaml
Expand All @@ -20,7 +20,7 @@ metadata:
labels:
app.kubernetes.io/name: dragonfly
app.kubernetes.io/instance: test
app.kubernetes.io/version: "v1.21.1"
app.kubernetes.io/version: "v1.21.4"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
Expand All @@ -42,7 +42,7 @@ metadata:
labels:
app.kubernetes.io/name: dragonfly
app.kubernetes.io/instance: test
app.kubernetes.io/version: "v1.21.1"
app.kubernetes.io/version: "v1.21.4"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -60,7 +60,7 @@ spec:
serviceAccountName: test-dragonfly
containers:
- name: dragonfly
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.21.1"
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.21.4"
imagePullPolicy: IfNotPresent
ports:
- name: dragonfly
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
labels:
app.kubernetes.io/name: dragonfly
app.kubernetes.io/instance: test
app.kubernetes.io/version: "v1.21.1"
app.kubernetes.io/version: "v1.21.4"
app.kubernetes.io/managed-by: Helm
---
# Source: dragonfly/templates/service.yaml
Expand All @@ -20,7 +20,7 @@ metadata:
labels:
app.kubernetes.io/name: dragonfly
app.kubernetes.io/instance: test
app.kubernetes.io/version: "v1.21.1"
app.kubernetes.io/version: "v1.21.4"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
Expand All @@ -42,7 +42,7 @@ metadata:
labels:
app.kubernetes.io/name: dragonfly
app.kubernetes.io/instance: test
app.kubernetes.io/version: "v1.21.1"
app.kubernetes.io/version: "v1.21.4"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -67,7 +67,7 @@ spec:
image: busybox:latest
name: sidecar-string
- name: dragonfly
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.21.1"
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.21.4"
imagePullPolicy: IfNotPresent
ports:
- name: dragonfly
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
labels:
app.kubernetes.io/name: dragonfly
app.kubernetes.io/instance: test
app.kubernetes.io/version: "v1.21.1"
app.kubernetes.io/version: "v1.21.4"
app.kubernetes.io/managed-by: Helm
---
# Source: dragonfly/templates/service.yaml
Expand All @@ -20,7 +20,7 @@ metadata:
labels:
app.kubernetes.io/name: dragonfly
app.kubernetes.io/instance: test
app.kubernetes.io/version: "v1.21.1"
app.kubernetes.io/version: "v1.21.4"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
Expand All @@ -42,7 +42,7 @@ metadata:
labels:
app.kubernetes.io/name: dragonfly
app.kubernetes.io/instance: test
app.kubernetes.io/version: "v1.21.1"
app.kubernetes.io/version: "v1.21.4"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -64,7 +64,7 @@ spec:
command: ["/bin/sh"]
args: ["-c", "date; sleep 3600;"]
- name: dragonfly
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.21.1"
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.21.4"
imagePullPolicy: IfNotPresent
ports:
- name: dragonfly
Expand Down
8 changes: 4 additions & 4 deletions contrib/charts/dragonfly/ci/extravolumes-values.golden.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
labels:
app.kubernetes.io/name: dragonfly
app.kubernetes.io/instance: test
app.kubernetes.io/version: "v1.21.1"
app.kubernetes.io/version: "v1.21.4"
app.kubernetes.io/managed-by: Helm
---
# Source: dragonfly/templates/service.yaml
Expand All @@ -20,7 +20,7 @@ metadata:
labels:
app.kubernetes.io/name: dragonfly
app.kubernetes.io/instance: test
app.kubernetes.io/version: "v1.21.1"
app.kubernetes.io/version: "v1.21.4"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
Expand All @@ -42,7 +42,7 @@ metadata:
labels:
app.kubernetes.io/name: dragonfly
app.kubernetes.io/instance: test
app.kubernetes.io/version: "v1.21.1"
app.kubernetes.io/version: "v1.21.4"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -60,7 +60,7 @@ spec:
serviceAccountName: test-dragonfly
containers:
- name: dragonfly
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.21.1"
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.21.4"
imagePullPolicy: IfNotPresent
ports:
- name: dragonfly
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ metadata:
labels:
app.kubernetes.io/name: dragonfly
app.kubernetes.io/instance: test
app.kubernetes.io/version: "v1.21.1"
app.kubernetes.io/version: "v1.21.4"
app.kubernetes.io/managed-by: Helm
---
# Source: dragonfly/templates/service.yaml
Expand All @@ -20,7 +20,7 @@ metadata:
labels:
app.kubernetes.io/name: dragonfly
app.kubernetes.io/instance: test
app.kubernetes.io/version: "v1.21.1"
app.kubernetes.io/version: "v1.21.4"
app.kubernetes.io/managed-by: Helm
spec:
type: ClusterIP
Expand All @@ -42,7 +42,7 @@ metadata:
labels:
app.kubernetes.io/name: dragonfly
app.kubernetes.io/instance: test
app.kubernetes.io/version: "v1.21.1"
app.kubernetes.io/version: "v1.21.4"
app.kubernetes.io/managed-by: Helm
spec:
replicas: 1
Expand All @@ -68,7 +68,7 @@ spec:
name: initcontainer-string
containers:
- name: dragonfly
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.21.1"
image: "docker.dragonflydb.io/dragonflydb/dragonfly:v1.21.4"
imagePullPolicy: IfNotPresent
ports:
- name: dragonfly
Expand Down
Loading

0 comments on commit 8b2703a

Please sign in to comment.