diff --git a/Jenkinsfile b/Jenkinsfile index e5d469c..b32e3f6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,8 +1,8 @@ def installRetryCount = 0 -def reportRetryCount = 0 +def exportRetryCount = 0 def checkRetryCount = 0 def checkRetryCountSec = 0 -def checkBinary = 0 + pipeline { options { @@ -49,18 +49,6 @@ pipeline { git branch: "master", credentialsId: "jaws_dynatrace_bitbuket_user", url: "https://atc.bmwgroup.net/bitbucket/scm/opapm/coco_apm_dynatrace_terraform_backup_exporter.git" } } - dir("/opt/workspace/coco_apm_dynatrace_terraform_backup_exporter/bin/") { - retry(3) { - sleep(300*checkBinary) - script { - checkBinary = checkBinary + 1 - } - sh''' - wget -qO- "https://github.com/dynatrace-oss/terraform-provider-dynatrace/releases/download/v1.30.2/terraform-provider-dynatrace_1.30.2_linux_amd64.zip" - python3 unzip.py terraform-provider-dynatrace_1.30.2_linux_amd64.zip - ''' - } - } } } } @@ -79,7 +67,7 @@ pipeline { } } - stage('Install Required Python Packages') { + stage('Install Required Packages') { steps { dir("/opt/workspace/coco_apm_dynatrace_terraform_backup_exporter/") { retry(3) { @@ -88,7 +76,11 @@ pipeline { installRetryCount = installRetryCount+1 } sh ''' - pip3 install --user -r requirements.txt + pip3 install --user -r requirements.txt + wget -qO- "https://github.com/dynatrace-oss/terraform-provider-dynatrace/releases/download/v1.30.2/terraform-provider-dynatrace_1.30.2_linux_amd64.zip" + python3 unzip.py terraform-provider-dynatrace_1.30.2_linux_amd64.zip + mkdir /opt/workspace/coco_apm_dynatrace_terraform_backup_exporter/bin + mv ./terraform-provider-dynatrace_1.30.2_linux_amd64 /bin/ ''' } } @@ -99,9 +91,9 @@ pipeline { steps { dir("/opt/workspace/coco_apm_dynatrace_terraform_backup_exporter/") { retry(3) { - sleep(300*reportRetryCount) - + sleep(300*exportRetryCount) script { + exportRetryCount = exportRetryCount + 1 sh "python3 export.py" } }