Skip to content

Commit

Permalink
Clean up various minor problems
Browse files Browse the repository at this point in the history
Some of this was remnants from when the kubernetes test was in this repo
  • Loading branch information
AlexanderWells-diamond committed Jul 10, 2023
1 parent a26d898 commit 86054d9
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 14 deletions.
3 changes: 0 additions & 3 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@ repos:
hooks:
- id: check-added-large-files
- id: check-yaml
# Helm templates aren't true YAML and so fail this checker
exclude: benchmark/kubernetes/perf_test/templates

- id: check-merge-conflict

- repo: local
Expand Down
4 changes: 2 additions & 2 deletions benchmark/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file contains the images for the performance test


# perf_client contains the Python client code that connects to the Coniql
# perf_client contains the Python client code that connects to the Coniql
# server via websockets
FROM python:3.10 as perf_client

Expand All @@ -18,7 +18,7 @@ COPY ./coniql_performance_test.py .
# to be flushed to stdout as they occur, rather than being buffered
ENTRYPOINT [ "python", "-u", "./coniql_performance_test.py" ]

# ioc generates a configurable sized DB, then runs an IOC
# ioc generates a configurable sized DB, then runs an IOC
FROM ghcr.io/epics-containers/epics-base-linux-runtime:23.6.1 as ioc

COPY ./generate_db.sh .
Expand Down
6 changes: 3 additions & 3 deletions benchmark/build_and_run_ioc.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/bash
# Generate an EPICS database and then run a softIOC using it
# Requires:
# Requires:
# EPICS installed and available
# Usage:
# ./build_and_run_ioc.sh <num_pvs>
# Usage:
# ./build_and_run_ioc.sh <num_pvs>
# where:
# <num_pvs> = the number of records the database will contain

Expand Down
8 changes: 4 additions & 4 deletions benchmark/generate_db.sh
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
#!/bin/bash
# Generate an EPICS record database of a specified size in a
# Generate an EPICS record database of a specified size in a
# specified location

# Usage:
# ./generate_db.sh <directory> <num_pvs>
# where:
# <directory> = directory in which the database file will be created
# <num_pvs> = the number of records the database will contain.
# <num_pvs> = the number of records the database will contain.


SUB_DIR=$1
N_PVS=$2

DATABASE_FILE=$SUB_DIR/coniqlPerformanceTestDb.db

# Setup: create db file for EPICS
# Setup: create db file for EPICS
echo "-> Creating EPICS db with $N_PVS PVs at $DATABASE_FILE"
for ((i=0;i<$N_PVS;i++))
do
Expand Down
2 changes: 0 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,9 @@ dev = [
"sphinx-rtd-theme-github-versions",
"tox-direct",
"types-mock",
"types-requests", # Required for benchmarking tests
"psutil", # Required for benchmarking tests
"pytest-asyncio>0.17",
"pytest-aiohttp",
"requests", # Required for benchmarking tests
"websockets", # Required for benchmarking tests
]

Expand Down

0 comments on commit 86054d9

Please sign in to comment.