Merge pull request #2 from PublicisSapient/qa-master

Qa master

Author: rapkalya

azure-pipeline-repo-processor-startup/Dockerfile

@@ -28,8 +28,8 @@ ENV APP_DIR="/app" \
 VOLUME $PROPERTIES_DIR
 
 # Set the JAR file variables
-ARG AZUREPIPELINE_JAR_FILE=processors/azure-pipeline/target/azurepipeline-processor.jar
-ARG AZUREREPO_JAR_FILE=processors/azure-repo/target/azurerepo-processor.jar
+ARG AZUREPIPELINE_JAR_FILE=azure-pipeline/target/azurepipeline-processor.jar
+ARG AZUREREPO_JAR_FILE=azure-repo/target/azurerepo-processor.jar
 
 # Set the properties file names
 ARG AZUREPIPELINE_PROPERTIES_FILE_NAME=azurepipeline.properties
@@ -47,7 +47,7 @@ EXPOSE 50015
 EXPOSE 50016
 
 # Copy startup script
-ADD processors/azure-pipeline-repo-processor-startup/start_combined_collector.sh $APP_DIR/start_combined_collector.sh
+ADD azure-pipeline-repo-processor-startup/start_combined_collector.sh $APP_DIR/start_combined_collector.sh
 
 # Set permissions for the startup script
 RUN chown -R $USER:$USER /app \

devops-processor-startup/Dockerfile

@@ -40,17 +40,17 @@ WORKDIR $APP_DIR
 VOLUME $PROPERTIES_DIR
 
 # Set the JAR file variables
-ARG ZEPHYR_JAR_FILE=processors/jira-zephyr-scale/target/zephyr-processor.jar
-ARG JIRA_TEST_JAR_FILE=processors/jira-xray-zephyr-squad/target/jiratest-processor.jar
-ARG BITBUCKET_JAR_FILE=processors/bitbucket/target/bitbucket-processor.jar
-ARG JENKINS_JAR_FILE=processors/jenkins/target/jenkins-processor.jar
-ARG SONAR_JAR_FILE=processors/sonar/target/sonar-processor.jar
-ARG BAMBOO_JAR_FILE=processors/bamboo/target/bamboo-processor.jar
-ARG TEAMCITY_JAR_FILE=processors/teamcity/target/teamcity-processor.jar
-ARG GITLAB_JAR_FILE=processors/gitlab/target/gitlab-processor.jar
-ARG GITHUB_JAR_FILE=processors/github/target/github-processor.jar
-ARG GITHUBACTION_JAR_FILE=processors/github-action/target/githubaction-processor.jar
-ARG ARGOCD_JAR_FILE=processors/argocd/target/argocd-processor.jar
+ARG ZEPHYR_JAR_FILE=jira-zephyr-scale/target/zephyr-processor.jar
+ARG JIRA_TEST_JAR_FILE=jira-xray-zephyr-squad/target/jiratest-processor.jar
+ARG BITBUCKET_JAR_FILE=bitbucket/target/bitbucket-processor.jar
+ARG JENKINS_JAR_FILE=jenkins/target/jenkins-processor.jar
+ARG SONAR_JAR_FILE=sonar/target/sonar-processor.jar
+ARG BAMBOO_JAR_FILE=bamboo/target/bamboo-processor.jar
+ARG TEAMCITY_JAR_FILE=teamcity/target/teamcity-processor.jar
+ARG GITLAB_JAR_FILE=gitlab/target/gitlab-processor.jar
+ARG GITHUB_JAR_FILE=github/target/github-processor.jar
+ARG GITHUBACTION_JAR_FILE=github-action/target/githubaction-processor.jar
+ARG ARGOCD_JAR_FILE=argocd/target/argocd-processor.jar
 
 # Set the properties file names
 ARG JENKINS_PROPERTIES_FILE_NAME=jenkins.properties
@@ -92,7 +92,7 @@ EXPOSE 50022
 EXPOSE 50023
 
 # Copy startup script
-ADD processors/devops-processor-startup/start_combined_collector.sh $APP_DIR/start_combined_collector.sh
+ADD devops-processor-startup/start_combined_collector.sh $APP_DIR/start_combined_collector.sh
 
 # Set the ownership of the working directory to the non-root user