Merge remote-tracking branch 'origin/ci-jenkinsfile-modifs' into integration_2023_w18b

f5db0a88 · Robert Schmidt · e7bf3b83 · bc68fcb3 · f5db0a88 · f5db0a88
Commit f5db0a88 authored May 08, 2023 by Robert Schmidt
9 changed files
--- a/ci-scripts/Jenkinsfile-GitLab-Container
+++ b/ci-scripts/Jenkinsfile-GitLab-Container
@@ -36,7 +36,6 @@ pipeline {
    label nodeExecutor
  }
  options {
-    disableConcurrentBuilds()
    timestamps()
    gitLabConnection('OAI GitLab')
    ansiColor('xterm')

--- a/ci-scripts/Jenkinsfile-cluster
+++ b/ci-scripts/Jenkinsfile-cluster
@@ -61,7 +61,6 @@ pipeline {
    label pythonExecutor
  }
  options {
-    disableConcurrentBuilds()
    timestamps()
    ansiColor('xterm')
    lock(extra: lockResources)

--- a/ci-scripts/Jenkinsfile-physim-deploy
+++ b/ci-scripts/Jenkinsfile-physim-deploy
@@ -55,7 +55,6 @@ pipeline {
    label pythonExecutor
  }
  options {
-    disableConcurrentBuilds()
    timestamps()
    ansiColor('xterm')
    lock(extra: lockResources)

--- a/ci-scripts/Jenkinsfile-push-registry
+++ b/ci-scripts/Jenkinsfile-push-registry
@@ -36,7 +36,6 @@ pipeline {
    label nodeExecutor
  }
  options {
-    disableConcurrentBuilds()
    ansiColor('xterm')
    lock(extra: lockResources)
  }

--- a/ci-scripts/Jenkinsfile-tmp-full-ran
+++ b/ci-scripts/Jenkinsfile-tmp-full-ran
@@ -61,7 +61,6 @@ pipeline {
        label pythonExecutor
    }
    options {
-        disableConcurrentBuilds()
        ansiColor('xterm')
        lock(extra: lockResources)
    }

--- a/ci-scripts/Jenkinsfile-tmp-multi-enb
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb
@@ -50,7 +50,6 @@ pipeline {
        label pythonExecutor
    }
    options {
-        disableConcurrentBuilds()
        ansiColor('xterm')
        lock(extra: lockResources)
    }

--- a/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
+++ b/ci-scripts/Jenkinsfile-tmp-multi-enb-nsa
@@ -52,7 +52,6 @@ def StatusForDb = ""
 pipeline {
  agent {label pythonExecutor}
  options {
-    disableConcurrentBuilds()
    ansiColor('xterm')
    lock(extra: lockResources)
  }

--- a/ci-scripts/Jenkinsfile-tmp-ran
+++ b/ci-scripts/Jenkinsfile-tmp-ran
@@ -63,7 +63,6 @@ pipeline {
        label pythonExecutor
    }
    options {
-        disableConcurrentBuilds()
        ansiColor('xterm')
        lock(extra: lockResources)
    }

--- a/ci-scripts/Jenkinsfile-tmp-ue
+++ b/ci-scripts/Jenkinsfile-tmp-ue
@@ -63,7 +63,6 @@ pipeline {
        label pythonExecutor
    }
    options {
-        disableConcurrentBuilds()
        ansiColor('xterm')
        lock(extra: lockResources)
    }