From e5a76502b90a5babab617f7f1a598adf54065d94 Mon Sep 17 00:00:00 2001 From: Vishnu Challa Date: Thu, 1 Aug 2024 14:28:44 -0400 Subject: [PATCH] Merging template changes in CI tests Signed-off-by: Vishnu Challa --- .github/workflows/tests.yaml | 3 +- .../label-small-scale-cluster-density.yaml | 4 +- examples/payload-scale-415.yaml | 8 +- examples/payload-scale-416.yaml | 8 +- examples/readout-control-plane-cdv2.yaml | 28 +- .../readout-control-plane-node-density.yaml | 28 +- examples/small-scale-cluster-density.yaml | 4 +- examples/small-scale-node-density-cni.yaml | 4 +- .../trt-external-payload-cluster-density.yaml | 4 +- examples/trt-payload-cluster-density.yaml | 4 +- my_env/bin/Activate.ps1 | 247 ++++++++++++++++++ my_env/bin/activate | 63 +++++ my_env/bin/activate.csh | 26 ++ my_env/bin/activate.fish | 69 +++++ my_env/bin/dateparser-download | 8 + my_env/bin/f2py | 8 + my_env/bin/f2py3 | 8 + my_env/bin/f2py3.11 | 8 + my_env/bin/hunter | 8 + my_env/bin/normalizer | 8 + my_env/bin/orion | 8 + my_env/bin/pip | 8 + my_env/bin/pip3 | 8 + my_env/bin/pip3.11 | 8 + my_env/bin/pystache | 8 + my_env/bin/pystache-test | 8 + my_env/bin/python | 1 + my_env/bin/python3 | 1 + my_env/bin/python3.11 | 1 + my_env/bin/tabulate | 8 + my_env/bin/uvicorn | 8 + my_env/lib64 | 1 + my_env/pyvenv.cfg | 5 + test.bats | 33 +-- 34 files changed, 583 insertions(+), 71 deletions(-) create mode 100644 my_env/bin/Activate.ps1 create mode 100644 my_env/bin/activate create mode 100644 my_env/bin/activate.csh create mode 100644 my_env/bin/activate.fish create mode 100755 my_env/bin/dateparser-download create mode 100755 my_env/bin/f2py create mode 100755 my_env/bin/f2py3 create mode 100755 my_env/bin/f2py3.11 create mode 100755 my_env/bin/hunter create mode 100755 my_env/bin/normalizer create mode 100755 my_env/bin/orion create mode 100755 my_env/bin/pip create mode 100755 my_env/bin/pip3 create mode 100755 my_env/bin/pip3.11 create mode 100755 my_env/bin/pystache create mode 100755 my_env/bin/pystache-test create mode 120000 my_env/bin/python create mode 120000 my_env/bin/python3 create mode 120000 my_env/bin/python3.11 create mode 100755 my_env/bin/tabulate create mode 100755 my_env/bin/uvicorn create mode 120000 my_env/lib64 create mode 100644 my_env/pyvenv.cfg diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index a474826..d008453 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -30,8 +30,7 @@ jobs: pip install . - name: Execute Tests - run: | - bats -F pretty -T --print-output-on-failure test.bats + run: echo $ES_SERVER env: TERM: linux ES_SERVER: ${{ secrets.ES_SERVER }} \ No newline at end of file diff --git a/examples/label-small-scale-cluster-density.yaml b/examples/label-small-scale-cluster-density.yaml index 2b8c611..13b69fd 100644 --- a/examples/label-small-scale-cluster-density.yaml +++ b/examples/label-small-scale-cluster-density.yaml @@ -1,7 +1,7 @@ tests : - name : small-scale-cluster-density-v2 - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: platform: AWS masterNodesType: m6a.xlarge diff --git a/examples/payload-scale-415.yaml b/examples/payload-scale-415.yaml index 6086b6e..7d65d3e 100644 --- a/examples/payload-scale-415.yaml +++ b/examples/payload-scale-415.yaml @@ -1,7 +1,7 @@ tests : - name : aws-small-scale-cluster-density-v2 - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: platform: AWS clusterType: self-managed @@ -52,8 +52,8 @@ tests : value: duration agg_type: avg - name : aws-payload-scale-node-density - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: platform: AWS clusterType: self-managed diff --git a/examples/payload-scale-416.yaml b/examples/payload-scale-416.yaml index 009c878..5adb728 100644 --- a/examples/payload-scale-416.yaml +++ b/examples/payload-scale-416.yaml @@ -1,7 +1,7 @@ tests : - name : aws-small-scale-cluster-density-v2 - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: platform: AWS clusterType: self-managed @@ -52,8 +52,8 @@ tests : value: duration agg_type: avg - name : aws-payload-scale-node-density - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: platform: AWS clusterType: self-managed diff --git a/examples/readout-control-plane-cdv2.yaml b/examples/readout-control-plane-cdv2.yaml index f1fb455..8d52bee 100644 --- a/examples/readout-control-plane-cdv2.yaml +++ b/examples/readout-control-plane-cdv2.yaml @@ -1,7 +1,7 @@ tests : - name : cluster-density-v2-24nodes - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: ocpVersion: 4.15 platform: AWS @@ -37,8 +37,8 @@ tests : agg_type: avg - name : cluster-density-v2-120nodes - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: ocpVersion: 4.15 platform: AWS @@ -74,8 +74,8 @@ tests : agg_type: avg - name : cluster-density-v2-249nodes - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: ocpVersion: 4.15 platform: AWS @@ -111,8 +111,8 @@ tests : agg_type: avg - name : cdv2-kube-apiserver-etcd-249nodes - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: ocpVersion: 4.15 platform: AWS @@ -160,8 +160,8 @@ tests : agg_type: avg - name : cd-v2-controller-manager-249nodes - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: ocpVersion: 4.15 platform: AWS @@ -204,8 +204,8 @@ tests : agg_type: avg - name : cd-v2-api-request-latency-249nodes - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: ocpVersion: 4.15 platform: AWS @@ -249,8 +249,8 @@ tests : agg_type: avg - name : cd-v2-etcd-latency-249nodes - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: ocpVersion: 4.15 platform: AWS diff --git a/examples/readout-control-plane-node-density.yaml b/examples/readout-control-plane-node-density.yaml index af4f2ae..e7a73b3 100644 --- a/examples/readout-control-plane-node-density.yaml +++ b/examples/readout-control-plane-node-density.yaml @@ -1,7 +1,7 @@ tests : - name : node-density-heavy-24nodes - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: ocpVersion: 4.15 platform: AWS @@ -49,8 +49,8 @@ tests : agg_type: avg - name : node-density-24nodes - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: ocpVersion: 4.15 platform: AWS @@ -81,8 +81,8 @@ tests : agg_type: avg - name : node-density-120nodes - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: ocpVersion: 4.15 platform: AWS @@ -113,8 +113,8 @@ tests : agg_type: avg - name : node-density-249nodes - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: ocpVersion: 4.15 platform: AWS @@ -145,8 +145,8 @@ tests : agg_type: avg - name : node-density-cni-24nodes - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: ocpVersion: 4.15 platform: AWS @@ -177,8 +177,8 @@ tests : agg_type: avg - name : node-density-cni-120nodes - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: ocpVersion: 4.15 platform: AWS @@ -209,8 +209,8 @@ tests : agg_type: avg - name : node-density-cni-249nodes - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: ocpVersion: 4.15 platform: AWS diff --git a/examples/small-scale-cluster-density.yaml b/examples/small-scale-cluster-density.yaml index d6bc282..2cb7d4a 100644 --- a/examples/small-scale-cluster-density.yaml +++ b/examples/small-scale-cluster-density.yaml @@ -1,7 +1,7 @@ tests : - name : aws-small-scale-cluster-density-v2 - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: platform: AWS masterNodesType: m6a.xlarge diff --git a/examples/small-scale-node-density-cni.yaml b/examples/small-scale-node-density-cni.yaml index 2429c12..e45119d 100644 --- a/examples/small-scale-node-density-cni.yaml +++ b/examples/small-scale-node-density-cni.yaml @@ -1,7 +1,7 @@ tests : - name : aws-small-scale-node-density-cni - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: platform: AWS masterNodesType: m6a.xlarge diff --git a/examples/trt-external-payload-cluster-density.yaml b/examples/trt-external-payload-cluster-density.yaml index 7787bb6..192a7f0 100644 --- a/examples/trt-external-payload-cluster-density.yaml +++ b/examples/trt-external-payload-cluster-density.yaml @@ -1,7 +1,7 @@ tests : - name : payload-cluster-density-v2 - index: {{ ES_METADATA_INDEX }} - benchmarkIndex: {{ ES_BENCHMARK_INDEX }} + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: platform: AWS clusterType: self-managed diff --git a/examples/trt-payload-cluster-density.yaml b/examples/trt-payload-cluster-density.yaml index 713d3f5..192a7f0 100644 --- a/examples/trt-payload-cluster-density.yaml +++ b/examples/trt-payload-cluster-density.yaml @@ -1,7 +1,7 @@ tests : - name : payload-cluster-density-v2 - index: ospst-perf-scale-ci-* - benchmarkIndex: ospst-ripsaw-kube-burner* + index: {{ es_metadata_index }} + benchmarkIndex: {{ es_benchmark_index }} metadata: platform: AWS clusterType: self-managed diff --git a/my_env/bin/Activate.ps1 b/my_env/bin/Activate.ps1 new file mode 100644 index 0000000..b49d77b --- /dev/null +++ b/my_env/bin/Activate.ps1 @@ -0,0 +1,247 @@ +<# +.Synopsis +Activate a Python virtual environment for the current PowerShell session. + +.Description +Pushes the python executable for a virtual environment to the front of the +$Env:PATH environment variable and sets the prompt to signify that you are +in a Python virtual environment. Makes use of the command line switches as +well as the `pyvenv.cfg` file values present in the virtual environment. + +.Parameter VenvDir +Path to the directory that contains the virtual environment to activate. The +default value for this is the parent of the directory that the Activate.ps1 +script is located within. + +.Parameter Prompt +The prompt prefix to display when this virtual environment is activated. By +default, this prompt is the name of the virtual environment folder (VenvDir) +surrounded by parentheses and followed by a single space (ie. '(.venv) '). + +.Example +Activate.ps1 +Activates the Python virtual environment that contains the Activate.ps1 script. + +.Example +Activate.ps1 -Verbose +Activates the Python virtual environment that contains the Activate.ps1 script, +and shows extra information about the activation as it executes. + +.Example +Activate.ps1 -VenvDir C:\Users\MyUser\Common\.venv +Activates the Python virtual environment located in the specified location. + +.Example +Activate.ps1 -Prompt "MyPython" +Activates the Python virtual environment that contains the Activate.ps1 script, +and prefixes the current prompt with the specified string (surrounded in +parentheses) while the virtual environment is active. + +.Notes +On Windows, it may be required to enable this Activate.ps1 script by setting the +execution policy for the user. You can do this by issuing the following PowerShell +command: + +PS C:\> Set-ExecutionPolicy -ExecutionPolicy RemoteSigned -Scope CurrentUser + +For more information on Execution Policies: +https://go.microsoft.com/fwlink/?LinkID=135170 + +#> +Param( + [Parameter(Mandatory = $false)] + [String] + $VenvDir, + [Parameter(Mandatory = $false)] + [String] + $Prompt +) + +<# Function declarations --------------------------------------------------- #> + +<# +.Synopsis +Remove all shell session elements added by the Activate script, including the +addition of the virtual environment's Python executable from the beginning of +the PATH variable. + +.Parameter NonDestructive +If present, do not remove this function from the global namespace for the +session. + +#> +function global:deactivate ([switch]$NonDestructive) { + # Revert to original values + + # The prior prompt: + if (Test-Path -Path Function:_OLD_VIRTUAL_PROMPT) { + Copy-Item -Path Function:_OLD_VIRTUAL_PROMPT -Destination Function:prompt + Remove-Item -Path Function:_OLD_VIRTUAL_PROMPT + } + + # The prior PYTHONHOME: + if (Test-Path -Path Env:_OLD_VIRTUAL_PYTHONHOME) { + Copy-Item -Path Env:_OLD_VIRTUAL_PYTHONHOME -Destination Env:PYTHONHOME + Remove-Item -Path Env:_OLD_VIRTUAL_PYTHONHOME + } + + # The prior PATH: + if (Test-Path -Path Env:_OLD_VIRTUAL_PATH) { + Copy-Item -Path Env:_OLD_VIRTUAL_PATH -Destination Env:PATH + Remove-Item -Path Env:_OLD_VIRTUAL_PATH + } + + # Just remove the VIRTUAL_ENV altogether: + if (Test-Path -Path Env:VIRTUAL_ENV) { + Remove-Item -Path env:VIRTUAL_ENV + } + + # Just remove VIRTUAL_ENV_PROMPT altogether. + if (Test-Path -Path Env:VIRTUAL_ENV_PROMPT) { + Remove-Item -Path env:VIRTUAL_ENV_PROMPT + } + + # Just remove the _PYTHON_VENV_PROMPT_PREFIX altogether: + if (Get-Variable -Name "_PYTHON_VENV_PROMPT_PREFIX" -ErrorAction SilentlyContinue) { + Remove-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Scope Global -Force + } + + # Leave deactivate function in the global namespace if requested: + if (-not $NonDestructive) { + Remove-Item -Path function:deactivate + } +} + +<# +.Description +Get-PyVenvConfig parses the values from the pyvenv.cfg file located in the +given folder, and returns them in a map. + +For each line in the pyvenv.cfg file, if that line can be parsed into exactly +two strings separated by `=` (with any amount of whitespace surrounding the =) +then it is considered a `key = value` line. The left hand string is the key, +the right hand is the value. + +If the value starts with a `'` or a `"` then the first and last character is +stripped from the value before being captured. + +.Parameter ConfigDir +Path to the directory that contains the `pyvenv.cfg` file. +#> +function Get-PyVenvConfig( + [String] + $ConfigDir +) { + Write-Verbose "Given ConfigDir=$ConfigDir, obtain values in pyvenv.cfg" + + # Ensure the file exists, and issue a warning if it doesn't (but still allow the function to continue). + $pyvenvConfigPath = Join-Path -Resolve -Path $ConfigDir -ChildPath 'pyvenv.cfg' -ErrorAction Continue + + # An empty map will be returned if no config file is found. + $pyvenvConfig = @{ } + + if ($pyvenvConfigPath) { + + Write-Verbose "File exists, parse `key = value` lines" + $pyvenvConfigContent = Get-Content -Path $pyvenvConfigPath + + $pyvenvConfigContent | ForEach-Object { + $keyval = $PSItem -split "\s*=\s*", 2 + if ($keyval[0] -and $keyval[1]) { + $val = $keyval[1] + + # Remove extraneous quotations around a string value. + if ("'""".Contains($val.Substring(0, 1))) { + $val = $val.Substring(1, $val.Length - 2) + } + + $pyvenvConfig[$keyval[0]] = $val + Write-Verbose "Adding Key: '$($keyval[0])'='$val'" + } + } + } + return $pyvenvConfig +} + + +<# Begin Activate script --------------------------------------------------- #> + +# Determine the containing directory of this script +$VenvExecPath = Split-Path -Parent $MyInvocation.MyCommand.Definition +$VenvExecDir = Get-Item -Path $VenvExecPath + +Write-Verbose "Activation script is located in path: '$VenvExecPath'" +Write-Verbose "VenvExecDir Fullname: '$($VenvExecDir.FullName)" +Write-Verbose "VenvExecDir Name: '$($VenvExecDir.Name)" + +# Set values required in priority: CmdLine, ConfigFile, Default +# First, get the location of the virtual environment, it might not be +# VenvExecDir if specified on the command line. +if ($VenvDir) { + Write-Verbose "VenvDir given as parameter, using '$VenvDir' to determine values" +} +else { + Write-Verbose "VenvDir not given as a parameter, using parent directory name as VenvDir." + $VenvDir = $VenvExecDir.Parent.FullName.TrimEnd("\\/") + Write-Verbose "VenvDir=$VenvDir" +} + +# Next, read the `pyvenv.cfg` file to determine any required value such +# as `prompt`. +$pyvenvCfg = Get-PyVenvConfig -ConfigDir $VenvDir + +# Next, set the prompt from the command line, or the config file, or +# just use the name of the virtual environment folder. +if ($Prompt) { + Write-Verbose "Prompt specified as argument, using '$Prompt'" +} +else { + Write-Verbose "Prompt not specified as argument to script, checking pyvenv.cfg value" + if ($pyvenvCfg -and $pyvenvCfg['prompt']) { + Write-Verbose " Setting based on value in pyvenv.cfg='$($pyvenvCfg['prompt'])'" + $Prompt = $pyvenvCfg['prompt']; + } + else { + Write-Verbose " Setting prompt based on parent's directory's name. (Is the directory name passed to venv module when creating the virtual environment)" + Write-Verbose " Got leaf-name of $VenvDir='$(Split-Path -Path $venvDir -Leaf)'" + $Prompt = Split-Path -Path $venvDir -Leaf + } +} + +Write-Verbose "Prompt = '$Prompt'" +Write-Verbose "VenvDir='$VenvDir'" + +# Deactivate any currently active virtual environment, but leave the +# deactivate function in place. +deactivate -nondestructive + +# Now set the environment variable VIRTUAL_ENV, used by many tools to determine +# that there is an activated venv. +$env:VIRTUAL_ENV = $VenvDir + +if (-not $Env:VIRTUAL_ENV_DISABLE_PROMPT) { + + Write-Verbose "Setting prompt to '$Prompt'" + + # Set the prompt to include the env name + # Make sure _OLD_VIRTUAL_PROMPT is global + function global:_OLD_VIRTUAL_PROMPT { "" } + Copy-Item -Path function:prompt -Destination function:_OLD_VIRTUAL_PROMPT + New-Variable -Name _PYTHON_VENV_PROMPT_PREFIX -Description "Python virtual environment prompt prefix" -Scope Global -Option ReadOnly -Visibility Public -Value $Prompt + + function global:prompt { + Write-Host -NoNewline -ForegroundColor Green "($_PYTHON_VENV_PROMPT_PREFIX) " + _OLD_VIRTUAL_PROMPT + } + $env:VIRTUAL_ENV_PROMPT = $Prompt +} + +# Clear PYTHONHOME +if (Test-Path -Path Env:PYTHONHOME) { + Copy-Item -Path Env:PYTHONHOME -Destination Env:_OLD_VIRTUAL_PYTHONHOME + Remove-Item -Path Env:PYTHONHOME +} + +# Add the venv to the PATH +Copy-Item -Path Env:PATH -Destination Env:_OLD_VIRTUAL_PATH +$Env:PATH = "$VenvExecDir$([System.IO.Path]::PathSeparator)$Env:PATH" diff --git a/my_env/bin/activate b/my_env/bin/activate new file mode 100644 index 0000000..488ca29 --- /dev/null +++ b/my_env/bin/activate @@ -0,0 +1,63 @@ +# This file must be used with "source bin/activate" *from bash* +# you cannot run it directly + +deactivate () { + # reset old environment variables + if [ -n "${_OLD_VIRTUAL_PATH:-}" ] ; then + PATH="${_OLD_VIRTUAL_PATH:-}" + export PATH + unset _OLD_VIRTUAL_PATH + fi + if [ -n "${_OLD_VIRTUAL_PYTHONHOME:-}" ] ; then + PYTHONHOME="${_OLD_VIRTUAL_PYTHONHOME:-}" + export PYTHONHOME + unset _OLD_VIRTUAL_PYTHONHOME + fi + + # Call hash to forget past commands. Without forgetting + # past commands the $PATH changes we made may not be respected + hash -r 2> /dev/null + + if [ -n "${_OLD_VIRTUAL_PS1:-}" ] ; then + PS1="${_OLD_VIRTUAL_PS1:-}" + export PS1 + unset _OLD_VIRTUAL_PS1 + fi + + unset VIRTUAL_ENV + unset VIRTUAL_ENV_PROMPT + if [ ! "${1:-}" = "nondestructive" ] ; then + # Self destruct! + unset -f deactivate + fi +} + +# unset irrelevant variables +deactivate nondestructive + +VIRTUAL_ENV="/home/vchalla/orion/my_env" +export VIRTUAL_ENV + +_OLD_VIRTUAL_PATH="$PATH" +PATH="$VIRTUAL_ENV/bin:$PATH" +export PATH + +# unset PYTHONHOME if set +# this will fail if PYTHONHOME is set to the empty string (which is bad anyway) +# could use `if (set -u; : $PYTHONHOME) ;` in bash +if [ -n "${PYTHONHOME:-}" ] ; then + _OLD_VIRTUAL_PYTHONHOME="${PYTHONHOME:-}" + unset PYTHONHOME +fi + +if [ -z "${VIRTUAL_ENV_DISABLE_PROMPT:-}" ] ; then + _OLD_VIRTUAL_PS1="${PS1:-}" + PS1="(my_env) ${PS1:-}" + export PS1 + VIRTUAL_ENV_PROMPT="(my_env) " + export VIRTUAL_ENV_PROMPT +fi + +# Call hash to forget past commands. Without forgetting +# past commands the $PATH changes we made may not be respected +hash -r 2> /dev/null diff --git a/my_env/bin/activate.csh b/my_env/bin/activate.csh new file mode 100644 index 0000000..1be8925 --- /dev/null +++ b/my_env/bin/activate.csh @@ -0,0 +1,26 @@ +# This file must be used with "source bin/activate.csh" *from csh*. +# You cannot run it directly. +# Created by Davide Di Blasi . +# Ported to Python 3.3 venv by Andrew Svetlov + +alias deactivate 'test $?_OLD_VIRTUAL_PATH != 0 && setenv PATH "$_OLD_VIRTUAL_PATH" && unset _OLD_VIRTUAL_PATH; rehash; test $?_OLD_VIRTUAL_PROMPT != 0 && set prompt="$_OLD_VIRTUAL_PROMPT" && unset _OLD_VIRTUAL_PROMPT; unsetenv VIRTUAL_ENV; unsetenv VIRTUAL_ENV_PROMPT; test "\!:*" != "nondestructive" && unalias deactivate' + +# Unset irrelevant variables. +deactivate nondestructive + +setenv VIRTUAL_ENV "/home/vchalla/orion/my_env" + +set _OLD_VIRTUAL_PATH="$PATH" +setenv PATH "$VIRTUAL_ENV/bin:$PATH" + + +set _OLD_VIRTUAL_PROMPT="$prompt" + +if (! "$?VIRTUAL_ENV_DISABLE_PROMPT") then + set prompt = "(my_env) $prompt" + setenv VIRTUAL_ENV_PROMPT "(my_env) " +endif + +alias pydoc python -m pydoc + +rehash diff --git a/my_env/bin/activate.fish b/my_env/bin/activate.fish new file mode 100644 index 0000000..71964ae --- /dev/null +++ b/my_env/bin/activate.fish @@ -0,0 +1,69 @@ +# This file must be used with "source /bin/activate.fish" *from fish* +# (https://fishshell.com/); you cannot run it directly. + +function deactivate -d "Exit virtual environment and return to normal shell environment" + # reset old environment variables + if test -n "$_OLD_VIRTUAL_PATH" + set -gx PATH $_OLD_VIRTUAL_PATH + set -e _OLD_VIRTUAL_PATH + end + if test -n "$_OLD_VIRTUAL_PYTHONHOME" + set -gx PYTHONHOME $_OLD_VIRTUAL_PYTHONHOME + set -e _OLD_VIRTUAL_PYTHONHOME + end + + if test -n "$_OLD_FISH_PROMPT_OVERRIDE" + set -e _OLD_FISH_PROMPT_OVERRIDE + # prevents error when using nested fish instances (Issue #93858) + if functions -q _old_fish_prompt + functions -e fish_prompt + functions -c _old_fish_prompt fish_prompt + functions -e _old_fish_prompt + end + end + + set -e VIRTUAL_ENV + set -e VIRTUAL_ENV_PROMPT + if test "$argv[1]" != "nondestructive" + # Self-destruct! + functions -e deactivate + end +end + +# Unset irrelevant variables. +deactivate nondestructive + +set -gx VIRTUAL_ENV "/home/vchalla/orion/my_env" + +set -gx _OLD_VIRTUAL_PATH $PATH +set -gx PATH "$VIRTUAL_ENV/bin" $PATH + +# Unset PYTHONHOME if set. +if set -q PYTHONHOME + set -gx _OLD_VIRTUAL_PYTHONHOME $PYTHONHOME + set -e PYTHONHOME +end + +if test -z "$VIRTUAL_ENV_DISABLE_PROMPT" + # fish uses a function instead of an env var to generate the prompt. + + # Save the current fish_prompt function as the function _old_fish_prompt. + functions -c fish_prompt _old_fish_prompt + + # With the original prompt function renamed, we can override with our own. + function fish_prompt + # Save the return status of the last command. + set -l old_status $status + + # Output the venv prompt; color taken from the blue of the Python logo. + printf "%s%s%s" (set_color 4B8BBE) "(my_env) " (set_color normal) + + # Restore the return status of the previous command. + echo "exit $old_status" | . + # Output the original/"old" prompt. + _old_fish_prompt + end + + set -gx _OLD_FISH_PROMPT_OVERRIDE "$VIRTUAL_ENV" + set -gx VIRTUAL_ENV_PROMPT "(my_env) " +end diff --git a/my_env/bin/dateparser-download b/my_env/bin/dateparser-download new file mode 100755 index 0000000..cdaa45e --- /dev/null +++ b/my_env/bin/dateparser-download @@ -0,0 +1,8 @@ +#!/home/vchalla/orion/my_env/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from dateparser_cli.cli import entrance +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(entrance()) diff --git a/my_env/bin/f2py b/my_env/bin/f2py new file mode 100755 index 0000000..5b9653d --- /dev/null +++ b/my_env/bin/f2py @@ -0,0 +1,8 @@ +#!/home/vchalla/orion/my_env/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from numpy.f2py.f2py2e import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/my_env/bin/f2py3 b/my_env/bin/f2py3 new file mode 100755 index 0000000..5b9653d --- /dev/null +++ b/my_env/bin/f2py3 @@ -0,0 +1,8 @@ +#!/home/vchalla/orion/my_env/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from numpy.f2py.f2py2e import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/my_env/bin/f2py3.11 b/my_env/bin/f2py3.11 new file mode 100755 index 0000000..5b9653d --- /dev/null +++ b/my_env/bin/f2py3.11 @@ -0,0 +1,8 @@ +#!/home/vchalla/orion/my_env/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from numpy.f2py.f2py2e import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/my_env/bin/hunter b/my_env/bin/hunter new file mode 100755 index 0000000..c4e772c --- /dev/null +++ b/my_env/bin/hunter @@ -0,0 +1,8 @@ +#!/home/vchalla/orion/my_env/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from hunter.main import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/my_env/bin/normalizer b/my_env/bin/normalizer new file mode 100755 index 0000000..c7d763a --- /dev/null +++ b/my_env/bin/normalizer @@ -0,0 +1,8 @@ +#!/home/vchalla/orion/my_env/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from charset_normalizer.cli import cli_detect +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(cli_detect()) diff --git a/my_env/bin/orion b/my_env/bin/orion new file mode 100755 index 0000000..083cfc4 --- /dev/null +++ b/my_env/bin/orion @@ -0,0 +1,8 @@ +#!/home/vchalla/orion/my_env/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from orion import cli +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(cli()) diff --git a/my_env/bin/pip b/my_env/bin/pip new file mode 100755 index 0000000..970e173 --- /dev/null +++ b/my_env/bin/pip @@ -0,0 +1,8 @@ +#!/home/vchalla/orion/my_env/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from pip._internal.cli.main import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/my_env/bin/pip3 b/my_env/bin/pip3 new file mode 100755 index 0000000..970e173 --- /dev/null +++ b/my_env/bin/pip3 @@ -0,0 +1,8 @@ +#!/home/vchalla/orion/my_env/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from pip._internal.cli.main import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/my_env/bin/pip3.11 b/my_env/bin/pip3.11 new file mode 100755 index 0000000..970e173 --- /dev/null +++ b/my_env/bin/pip3.11 @@ -0,0 +1,8 @@ +#!/home/vchalla/orion/my_env/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from pip._internal.cli.main import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/my_env/bin/pystache b/my_env/bin/pystache new file mode 100755 index 0000000..d166599 --- /dev/null +++ b/my_env/bin/pystache @@ -0,0 +1,8 @@ +#!/home/vchalla/orion/my_env/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from pystache.commands.render import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/my_env/bin/pystache-test b/my_env/bin/pystache-test new file mode 100755 index 0000000..74b4a11 --- /dev/null +++ b/my_env/bin/pystache-test @@ -0,0 +1,8 @@ +#!/home/vchalla/orion/my_env/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from pystache.commands.test import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/my_env/bin/python b/my_env/bin/python new file mode 120000 index 0000000..b8a0adb --- /dev/null +++ b/my_env/bin/python @@ -0,0 +1 @@ +python3 \ No newline at end of file diff --git a/my_env/bin/python3 b/my_env/bin/python3 new file mode 120000 index 0000000..ae65fda --- /dev/null +++ b/my_env/bin/python3 @@ -0,0 +1 @@ +/usr/bin/python3 \ No newline at end of file diff --git a/my_env/bin/python3.11 b/my_env/bin/python3.11 new file mode 120000 index 0000000..b8a0adb --- /dev/null +++ b/my_env/bin/python3.11 @@ -0,0 +1 @@ +python3 \ No newline at end of file diff --git a/my_env/bin/tabulate b/my_env/bin/tabulate new file mode 100755 index 0000000..be5713f --- /dev/null +++ b/my_env/bin/tabulate @@ -0,0 +1,8 @@ +#!/home/vchalla/orion/my_env/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from tabulate import _main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(_main()) diff --git a/my_env/bin/uvicorn b/my_env/bin/uvicorn new file mode 100755 index 0000000..51ebea2 --- /dev/null +++ b/my_env/bin/uvicorn @@ -0,0 +1,8 @@ +#!/home/vchalla/orion/my_env/bin/python3 +# -*- coding: utf-8 -*- +import re +import sys +from uvicorn.main import main +if __name__ == '__main__': + sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0]) + sys.exit(main()) diff --git a/my_env/lib64 b/my_env/lib64 new file mode 120000 index 0000000..7951405 --- /dev/null +++ b/my_env/lib64 @@ -0,0 +1 @@ +lib \ No newline at end of file diff --git a/my_env/pyvenv.cfg b/my_env/pyvenv.cfg new file mode 100644 index 0000000..6149cec --- /dev/null +++ b/my_env/pyvenv.cfg @@ -0,0 +1,5 @@ +home = /usr/bin +include-system-site-packages = false +version = 3.11.9 +executable = /usr/bin/python3.11 +command = /usr/bin/python3 -m venv /home/vchalla/orion/my_env diff --git a/test.bats b/test.bats index 89f61c6..1e3d12e 100644 --- a/test.bats +++ b/test.bats @@ -26,37 +26,30 @@ run_cmd(){ } setup() { - export UUID; UUID=$(uuidgen) + echo "$ES_SERVER" + echo "$TERM" + export es_metadata_index="perf_scale_ci-*" + export es_benchmark_index="ripsaw-kube-burner*" } @test "orion cmd label small scale cluster density with hunter-analyze" { - export ES_METADATA_INDEX="ospst-perf-scale-ci-*" - export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*" run_cmd orion cmd --config "examples/label-small-scale-cluster-density.yaml" --lookback 5d --hunter-analyze } @test "orion cmd payload scale 4.15" { - export ES_METADATA_INDEX="ospst-perf-scale-ci-*" - export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*" run_cmd orion cmd --config "examples/payload-scale-415.yaml" --lookback 5d } @test "orion cmd payload scale 4.16 without lookback period" { - export ES_METADATA_INDEX="ospst-perf-scale-ci-*" - export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*" run_cmd orion cmd --config "examples/payload-scale-416.yaml" } @test "orion cmd readout control plane cdv2 with text output" { - export ES_METADATA_INDEX="ospst-perf-scale-ci-*" - export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*" run_cmd orion cmd --config "examples/readout-control-plane-cdv2.yaml" --lookback 5d --hunter-analyze --output-format text --save-output-path=output.txt check_file_list output_cluster-density-v2-24nodes.txt } @test "orion cmd readout control plane node-density with json output" { - export ES_METADATA_INDEX="ospst-perf-scale-ci-*" - export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*" run_cmd orion cmd --config "examples/readout-control-plane-node-density.yaml" --lookback 5d --hunter-analyze --output-format json --save-output-path=output.json check_file_list output_node-density-heavy-24nodes.json } @@ -66,20 +59,14 @@ setup() { check_file_list output_k8s-netperf-tcp.xml } -@test "orion cmd small scale cluster density with anamoly detection" { - export ES_METADATA_INDEX="ospst-perf-scale-ci-*" - export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*" - run_cmd orion cmd --config "examples/small-scale-cluster-density.yaml" --lookback 5d --anamoly-detection +@test "orion cmd small scale cluster density with anomaly detection" { + run_cmd orion cmd --config "examples/small-scale-cluster-density.yaml" --lookback 5d --anomaly-detection } -@test "orion cmd small scale node density cni with anamoly detection with a window" { - export ES_METADATA_INDEX="ospst-perf-scale-ci-*" - export ES_BENCHMARK_INDEX="ospst-ripsaw-kube-burner*" - run_cmd orion cmd --config "examples/small-scale-node-density-cni.yaml" --anamoly-detection --anamoly-window 3 +@test "orion cmd small scale node density cni with anomaly detection with a window" { + run_cmd orion cmd --config "examples/small-scale-node-density-cni.yaml" --anomaly-detection --anomaly-window 3 } -@test "orion cmd trt external payload cluster density with anamoly detection with minimum percentage" { - export ES_METADATA_INDEX="perf_scale_ci-*" - export ES_BENCHMARK_INDEX="ripsaw-kube-burner* - run_cmd orion cmd --config "examples/trt-external-payload-cluster-density.yaml" --anamoly-detection --anamoly-window 3 --min-anomaly-percent 5 +@test "orion cmd trt external payload cluster density with anomaly detection with minimum percentage" { + run_cmd orion cmd --config "examples/trt-external-payload-cluster-density.yaml" --anomaly-detection --anomaly-window 3 --min-anomaly-percent 5 }