source the pbench-agent/profile

openshift-scale · Apr 29, 2020 · 98f3da9 · 98f3da9
1 parent d0712da
commit 98f3da9
Show file tree

Hide file tree

Showing 23 changed files with 23 additions and 23 deletions.
diff --git a/docs/conformance.md b/docs/conformance.md
@@ -49,7 +49,7 @@ Location of kubeconfig on orchestration host.
 
 ### PBENCH_INSTRUMENTATION
 Default: `false`  
-Enables/disables running the workload wrapped by pbench-user-benchmark. When enabled, pbench agents can then be enabled (`ENABLE_PBENCH_AGENTS`) for further instrumentation data and pbench-copy-results can be enabled (`ENABLE_PBENCH_COPY`) to export captured data for further analysis.
+Enables/disables running the workload wrapped by pbench-user-benchmark. When enabled, pbench agents can then be enabled (`ENABLE_PBENCH_AGENTS`) for further instrumentation data and pbench-copy-results can be enabled (`ENABLE_PBENCH_COPY`) to export captured data for further analysis. Also, we can export the results to the server without enabling (`ENABLE_PBENCH_AGENTS`)
 
 ### ENABLE_PBENCH_AGENTS
 Default: `false`  

diff --git a/docs/mastervertical.md b/docs/mastervertical.md
@@ -73,7 +73,7 @@ Location of kubeconfig on orchestration host.
 
 ### PBENCH_INSTRUMENTATION
 Default: `false`  
-Enables/disables running the workload wrapped by pbench-user-benchmark. When enabled, pbench agents can then be enabled (`ENABLE_PBENCH_AGENTS`) for further instrumentation data and pbench-copy-results can be enabled (`ENABLE_PBENCH_COPY`) to export captured data for further analysis.
+Enables/disables running the workload wrapped by pbench-user-benchmark. When enabled, pbench agents can then be enabled (`ENABLE_PBENCH_AGENTS`) for further instrumentation data and pbench-copy-results can be enabled (`ENABLE_PBENCH_COPY`) to export captured data for further analysis. Also, we can export the results to the server without enabling (`ENABLE_PBENCH_AGENTS`) 
 
 ### ENABLE_PBENCH_AGENTS
 Default: `false`  

diff --git a/docs/namespaces-per-cluster.md b/docs/namespaces-per-cluster.md
@@ -69,7 +69,7 @@ Location of kubeconfig on orchestration host.
 
 ### PBENCH_INSTRUMENTATION
 Default: `false`  
-Enables/disables running the workload wrapped by pbench-user-benchmark. When enabled, pbench agents can then be enabled (`ENABLE_PBENCH_AGENTS`) for further instrumentation data and pbench-copy-results can be enabled (`ENABLE_PBENCH_COPY`) to export captured data for further analysis.
+Enables/disables running the workload wrapped by pbench-user-benchmark. When enabled, pbench agents can then be enabled (`ENABLE_PBENCH_AGENTS`) for further instrumentation data and pbench-copy-results can be enabled (`ENABLE_PBENCH_COPY`) to export captured data for further analysis. Also, we can export the results to the server without enabling (`ENABLE_PBENCH_AGENTS`)
 
 ### ENABLE_PBENCH_AGENTS
 Default: `false`  

diff --git a/docs/nodevertical.md b/docs/nodevertical.md
@@ -72,7 +72,7 @@ Location of kubeconfig on orchestration host.
 
 ### PBENCH_INSTRUMENTATION
 Default: `false`  
-Enables/disables running the workload wrapped by pbench-user-benchmark. When enabled, pbench agents can then be enabled (`ENABLE_PBENCH_AGENTS`) for further instrumentation data and pbench-copy-results can be enabled (`ENABLE_PBENCH_COPY`) to export captured data for further analysis.
+Enables/disables running the workload wrapped by pbench-user-benchmark. When enabled, pbench agents can then be enabled (`ENABLE_PBENCH_AGENTS`) for further instrumentation data and pbench-copy-results can be enabled (`ENABLE_PBENCH_COPY`) to export captured data for further analysis. Also, we can export the results to the server without enabling (`ENABLE_PBENCH_AGENTS`)
 
 ### ENABLE_PBENCH_AGENTS
 Default: `false`  

diff --git a/docs/podvertical.md b/docs/podvertical.md
@@ -69,7 +69,7 @@ Location of kubeconfig on orchestration host.
 
 ### PBENCH_INSTRUMENTATION
 Default: `false`  
-Enables/disables running the workload wrapped by pbench-user-benchmark. When enabled, pbench agents can then be enabled (`ENABLE_PBENCH_AGENTS`) for further instrumentation data and pbench-copy-results can be enabled (`ENABLE_PBENCH_COPY`) to export captured data for further analysis.
+Enables/disables running the workload wrapped by pbench-user-benchmark. When enabled, pbench agents can then be enabled (`ENABLE_PBENCH_AGENTS`) for further instrumentation data and pbench-copy-results can be enabled (`ENABLE_PBENCH_COPY`) to export captured data for further analysis. Also, we can export the results to the server without enabling (`ENABLE_PBENCH_AGENTS`)
 
 ### ENABLE_PBENCH_AGENTS
 Default: `false`  

diff --git a/docs/prometheus-scale.md b/docs/prometheus-scale.md
@@ -49,7 +49,7 @@ Location of kubeconfig on orchestration host.
 
 ### PBENCH_INSTRUMENTATION
 Default: `false`  
-Enables/disables running the workload wrapped by pbench-user-benchmark. When enabled, pbench agents can then be enabled (`ENABLE_PBENCH_AGENTS`) for further instrumentation data and pbench-copy-results can be enabled (`ENABLE_PBENCH_COPY`) to export captured data for further analysis.
+Enables/disables running the workload wrapped by pbench-user-benchmark. When enabled, pbench agents can then be enabled (`ENABLE_PBENCH_AGENTS`) for further instrumentation data and pbench-copy-results can be enabled (`ENABLE_PBENCH_COPY`) to export captured data for further analysis. Also, we can export the results to the server without enabling (`ENABLE_PBENCH_AGENTS`)
 
 ### ENABLE_PBENCH_AGENTS
 Default: `false`  

diff --git a/docs/scale.md b/docs/scale.md
@@ -49,7 +49,7 @@ Location of kubeconfig on orchestration host.
 
 ### PBENCH_INSTRUMENTATION
 Default: `false`  
-Enables/disables running the workload wrapped by pbench-user-benchmark. When enabled, pbench agents can then be enabled (`ENABLE_PBENCH_AGENTS`) for further instrumentation data and pbench-copy-results can be enabled (`ENABLE_PBENCH_COPY`) to export captured data for further analysis.
+Enables/disables running the workload wrapped by pbench-user-benchmark. When enabled, pbench agents can then be enabled (`ENABLE_PBENCH_AGENTS`) for further instrumentation data and pbench-copy-results can be enabled (`ENABLE_PBENCH_COPY`) to export captured data for further analysis. Also, we can export the results to the server without enabling (`ENABLE_PBENCH_AGENTS`)
 
 ### ENABLE_PBENCH_AGENTS
 Default: `false`  

diff --git a/docs/services-per-namespace.md b/docs/services-per-namespace.md
@@ -69,7 +69,7 @@ Location of kubeconfig on orchestration host.
 
 ### PBENCH_INSTRUMENTATION
 Default: `false`  
-Enables/disables running the workload wrapped by pbench-user-benchmark. When enabled, pbench agents can then be enabled (`ENABLE_PBENCH_AGENTS`) for further instrumentation data and pbench-copy-results can be enabled (`ENABLE_PBENCH_COPY`) to export captured data for further analysis.
+Enables/disables running the workload wrapped by pbench-user-benchmark. When enabled, pbench agents can then be enabled (`ENABLE_PBENCH_AGENTS`) for further instrumentation data and pbench-copy-results can be enabled (`ENABLE_PBENCH_COPY`) to export captured data for further analysis. Also, we can export the results to the server without enabling (`ENABLE_PBENCH_AGENTS`)
 
 ### ENABLE_PBENCH_AGENTS
 Default: `false`  

diff --git a/workloads/files/workload-conformance-script-cm.yml b/workloads/files/workload-conformance-script-cm.yml
@@ -11,8 +11,8 @@ data:
     workload_log "Configuring pbench for Conformance"
     mkdir -p /var/lib/pbench-agent/tools-default/
     echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
+    source /opt/pbench-agent/profile
     if [ "${ENABLE_PBENCH_AGENTS}" = true ]; then
-      source /opt/pbench-agent/profile
       # clear tools/remotes to make sure there are no invalid remotes
       set +eo pipefail
       pbench-clear-tools

diff --git a/workloads/files/workload-http-script-cm.yml b/workloads/files/workload-http-script-cm.yml
@@ -10,8 +10,8 @@ data:
     # pbench Configuration
     mkdir -p /var/lib/pbench-agent/tools-default/
     echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
+    source /opt/pbench-agent/profile
     if [ "${ENABLE_PBENCH_AGENTS}" = true ]; then
-      source /opt/pbench-agent/profile
       # clear tools/remotes to make sure there are no invalid remotes
       set +e
       pbench-clear-tools

diff --git a/workloads/files/workload-prometheus-script-cm.yml b/workloads/files/workload-prometheus-script-cm.yml
@@ -13,8 +13,8 @@ data:
     workload_log "Configuring pbench for Prometheus scale"
     mkdir -p /var/lib/pbench-agent/tools-default/
     echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
+    source /opt/pbench-agent/profile
     if [ "${ENABLE_PBENCH_AGENTS}" = true ]; then
-      source /opt/pbench-agent/profile
       # clear tools/remotes to make sure there are no invalid remotes
       set +eo pipefail
       pbench-clear-tools

diff --git a/workloads/files/workload-scale-script-cm.yml b/workloads/files/workload-scale-script-cm.yml
@@ -11,8 +11,8 @@ data:
     workload_log "Configuring pbench for running Scale workload"
     mkdir -p /var/lib/pbench-agent/tools-default/
     echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
+    source /opt/pbench-agent/profile
     if [ "${ENABLE_PBENCH_AGENTS}" = true ]; then
-      source /opt/pbench-agent/profile
       # clear tools/remotes to make sure there are no invalid remotes
       set +eo pipefail
       pbench-clear-tools

diff --git a/workloads/files/workload-test-script-cm.yml b/workloads/files/workload-test-script-cm.yml
@@ -8,8 +8,8 @@ data:
     # pbench Configuration
     mkdir -p /var/lib/pbench-agent/tools-default/
     echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
+    source /opt/pbench-agent/profile
     if [ "${ENABLE_PBENCH_AGENTS}" = true ]; then
-      source /opt/pbench-agent/profile
       # clear tools/remotes to make sure there are no invalid remotes
       pbench-clear-tools | exit 0
       echo "" > /var/lib/pbench-agent/tools-default/disk

diff --git a/workloads/templates/workload-baseline-script-cm.yml.j2 b/workloads/templates/workload-baseline-script-cm.yml.j2
@@ -10,8 +10,8 @@ data:
     echo "$(date -u) Configuring pbench for running Baseline workload"
     mkdir -p /var/lib/pbench-agent/tools-default/
     echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
+    source /opt/pbench-agent/profile
     if [ "${ENABLE_PBENCH_AGENTS}" = true ]; then
-      source /opt/pbench-agent/profile
       # clear tools/remotes to make sure there are no invalid remotes
       set +eo pipefail
       pbench-clear-tools

diff --git a/workloads/templates/workload-deployments-per-ns-script-cm.yml.j2 b/workloads/templates/workload-deployments-per-ns-script-cm.yml.j2
@@ -10,8 +10,8 @@ data:
     echo "$(date -u) Configuring pbench for Deployments per namespace cluster limits test"
     mkdir -p /var/lib/pbench-agent/tools-default/
     echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
+    source /opt/pbench-agent/profile
     if [ "${ENABLE_PBENCH_AGENTS}" = true ]; then
-      source /opt/pbench-agent/profile
       # clear tools/remotes to make sure there are no invalid remotes
       set +eo pipefail
       pbench-clear-tools

diff --git a/workloads/templates/workload-fio-script-cm.yml.j2 b/workloads/templates/workload-fio-script-cm.yml.j2
@@ -12,8 +12,8 @@ data:
     echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
     echo "" > /var/lib/pbench-agent/tools-default/oc
     echo "workload" > /var/lib/pbench-agent/tools-default/label
+    source /opt/pbench-agent/profile
     if [[ -v ENABLE_PBENCH_AGENTS ]]; then
-      source /opt/pbench-agent/profile
       # clear tools/remotes to make sure there are no invalid remotes
       set +eo pipefail
       pbench-clear-tools

diff --git a/workloads/templates/workload-mastervertical-script-cm.yml.j2 b/workloads/templates/workload-mastervertical-script-cm.yml.j2
@@ -11,8 +11,8 @@ data:
     workload_log "Configuring pbench for MasterVertical"
     mkdir -p /var/lib/pbench-agent/tools-default/
     echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
+    source /opt/pbench-agent/profile
     if [ "${ENABLE_PBENCH_AGENTS}" = true ]; then
-      source /opt/pbench-agent/profile
       # clear tools/remotes to make sure there are no invalid remotes
       set +eo pipefail
       pbench-clear-tools

diff --git a/workloads/templates/workload-namespaces-per-cluster-script-cm.yml.j2 b/workloads/templates/workload-namespaces-per-cluster-script-cm.yml.j2
@@ -11,8 +11,8 @@ data:
     workload_log "Configuring pbench for Namespaces per cluster test"
     mkdir -p /var/lib/pbench-agent/tools-default/
     echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
+    source /opt/pbench-agent/profile
     if [[ -v ENABLE_PBENCH_AGENTS ]]; then
-      source /opt/pbench-agent/profile
       # clear tools/remotes to make sure there are no invalid remotes
       set +eo pipefail
       pbench-clear-tools

diff --git a/workloads/templates/workload-network-script-cm.yml.j2 b/workloads/templates/workload-network-script-cm.yml.j2
@@ -11,8 +11,8 @@ data:
     log "Configuring pbench for Network benchmarks"
     mkdir -p /var/lib/pbench-agent/tools-default/
     echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
+    source /opt/pbench-agent/profile
     if [ "${ENABLE_PBENCH_AGENTS}" = true ]; then
-      source /opt/pbench-agent/profile
       # clear tools/remotes to make sure there are no invalid remotes
       set +eo pipefail
       pbench-clear-tools

diff --git a/workloads/templates/workload-nodevertical-script-cm.yml.j2 b/workloads/templates/workload-nodevertical-script-cm.yml.j2
@@ -11,8 +11,8 @@ data:
     workload_log "Configuring pbench for NodeVertical"
     mkdir -p /var/lib/pbench-agent/tools-default/
     echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
+    source /opt/pbench-agent/profile
     if [ "${ENABLE_PBENCH_AGENTS}" = true ]; then
-      source /opt/pbench-agent/profile
       # clear tools/remotes to make sure there are no invalid remotes
       set +eo pipefail
       pbench-clear-tools

diff --git a/workloads/templates/workload-podvertical-script-cm.yml.j2 b/workloads/templates/workload-podvertical-script-cm.yml.j2
@@ -11,8 +11,8 @@ data:
     workload_log "Configuring pbench for PodVertical"
     mkdir -p /var/lib/pbench-agent/tools-default/
     echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
+    source /opt/pbench-agent/profile
     if [ "${ENABLE_PBENCH_AGENTS}" = true ]; then
-      source /opt/pbench-agent/profile
       # clear tools/remotes to make sure there are no invalid remotes
       set +eo pipefail
       pbench-clear-tools

diff --git a/workloads/templates/workload-pvcscale-script-cm.yml.j2 b/workloads/templates/workload-pvcscale-script-cm.yml.j2
@@ -10,8 +10,8 @@ data:
     echo "$(date -u) Configuring pbench for PVC scale test"
     mkdir -p /var/lib/pbench-agent/tools-default/
     echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
+    source /opt/pbench-agent/profile
     if [ "${ENABLE_PBENCH_AGENTS}" = true ]; then
-      source /opt/pbench-agent/profile
       # clear tools/remotes to make sure there are no invalid remotes
       set +eo pipefail
       pbench-clear-tools

diff --git a/workloads/templates/workload-services-per-namespace-script-cm.yml.j2 b/workloads/templates/workload-services-per-namespace-script-cm.yml.j2
@@ -11,8 +11,8 @@ data:
     workload_log "Configuring pbench for services per namespace test"
     mkdir -p /var/lib/pbench-agent/tools-default/
     echo "${USER_NAME:-default}:x:$(id -u):0:${USER_NAME:-default} user:${HOME}:/sbin/nologin" >> /etc/passwd
+    source /opt/pbench-agent/profile
     if [[ -v ENABLE_PBENCH_AGENTS ]]; then
-      source /opt/pbench-agent/profile
       # clear tools/remotes to make sure there are no invalid remotes
       set +eo pipefail
       pbench-clear-tools