Decouple jmeter and perf test container

.github/workflows/jmeter_container_update.yml

@@ -0,0 +1,27 @@
+name: Jmeter container update
+
+on:
+  workflow_dispatch:
+  push:
+      branches:
+          - 'main'
+      paths:
+          - 'jmeter/**'
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v2
+    - name: Login to DockerHub
+      uses: docker/login-action@v1
+      with:
+        username: ${{ secrets.DOCKER_HUB_USERNAME }}
+        password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+    - name: Docker build
+      run: |
+        docker build -t ballerina/jmeter_container:latest ./base-image
+    - name: Docker push
+      run: |
+        docker images
+        docker push ballerina/jmeter_container:latest:latest

base-image/Dockerfile

@@ -1,8 +1,6 @@
-FROM ubuntu:18.04
+FROM ballerina/jmeter_container:latest
 LABEL maintainer="[email protected]"
 
-RUN apt update -y && apt install curl wget default-jre unzip jq git sudo -y
-
 RUN useradd -m ballerina && echo "ballerina:ballerina" | chpasswd && adduser ballerina sudo
 WORKDIR /home/ballerina
 RUN echo "ballerina ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
@@ -11,16 +9,12 @@ USER ballerina
 SHELL ["/bin/bash", "-c"]
 
 COPY --chown=ballerina execute-tests.sh /home/ballerina/setup/ 
-COPY --chown=ballerina configure-jmeter.sh /home/ballerina/setup/ 
 COPY --chown=ballerina base-scenario.sh /home/ballerina/setup/ 
 COPY --chown=ballerina utils /home/ballerina/setup/utils/
 
-RUN (cd /home/ballerina/setup/; ./configure-jmeter.sh -i /home/ballerina/ -d)
-
 ENV PATH=$PATH:/home/ballerina/setup/utils/jtl-splitter/
 ENV PATH=$PATH:/home/ballerina/setup/utils/payloads/
 ENV PATH=$PATH:/home/ballerina/setup/utils/csv/
-ENV PATH=$PATH:/home/ballerina/apache-jmeter-5.4/bin/
 ENV PATH=$PATH:/home/ballerina/setup/
 
 ENV REPO_NAME=""

base-image/execute-tests.sh

@@ -126,7 +126,7 @@ if [[ -z ${SPACE_ID} || -z ${MESSAGE_KEY} || -z ${CHAT_TOKEN} ]]; then
     echo "--- Notification Service skipped as configurations not set"
 else 
     echo "--------Starting Notification Service--------"
-     docker run -v /home/ballerina/"${REPO_NAME}"/load-tests/"${SCENARIO_NAME}"/results/:/summary -e SPACE_ID="${SPACE_ID}" -e MESSAGE_KEY="${MESSAGE_KEY}" -e CHAT_TOKEN="${CHAT_TOKEN}" -e SCENARIO_NAME="${SCENARIO_NAME}" ballerina/chat_notifications
+    # docker run -v /home/ballerina/"${REPO_NAME}"/load-tests/"${SCENARIO_NAME}"/results/:/summary -e SPACE_ID="${SPACE_ID}" -e MESSAGE_KEY="${MESSAGE_KEY}" -e CHAT_TOKEN="${CHAT_TOKEN}" -e SCENARIO_NAME="${SCENARIO_NAME}" ballerina/chat_notifications
     echo "--------Notification Service executed--------"
 fi
 

jmeter/Dockerfile

@@ -0,0 +1,15 @@
+FROM ubuntu:18.04
+LABEL maintainer="[email protected]"
+
+RUN apt update -y && apt install curl wget default-jre unzip jq git sudo -y
+
+SHELL ["/bin/bash", "-c"]
+
+COPY configure-jmeter.sh /
+
+RUN ./configure-jmeter.sh -i /opt/ -d
+
+ENV PATH=$PATH:/opt/apache-jmeter-5.4/bin/
+ENV JMETER_HOME=/opt/apache-jmeter-5.4
+
+CMD jmeter

base-image/configure-jmeter.sh → jmeter/configure-jmeter.sh

@@ -187,7 +187,6 @@ done
 # Set cmdrunner version in JMeterPluginsCMD.sh
 sed -i "s/cmdrunner-.*\.jar/$cmdrunner_jar/g" $extracted_dirname/bin/JMeterPluginsCMD.sh
 
-export PATH=$PATH:/home/ballerina/apache-jmeter-5.4/bin/
 $PluginsManagerCMD upgrades
-ls /home/ballerina/apache-jmeter-5.4/lib/ext
-echo "JVM_ARGS=\"-XX:InitialRAMPercentage=25.0 -XX:MaxRAMPercentage=75.0 -Dnashorn.args=--no-deprecation-warning\"" | tee -a /home/ballerina/apache-jmeter-5.4/bin/setenv.sh
+ls /opt/apache-jmeter-5.4/lib/ext
+echo "JVM_ARGS=\"-XX:InitialRAMPercentage=25.0 -XX:MaxRAMPercentage=75.0 -Dnashorn.args=--no-deprecation-warning\"" | tee -a /opt/apache-jmeter-5.4/bin/setenv.sh