Adding upstream version 9.4.0+dfsg.upstream/9.4.0+dfsg

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 89 insertions, 25 deletions

diff --git a/ansible_collections/cyberark/conjur/Jenkinsfile b/ansible_collections/cyberark/conjur/Jenkinsfile
index 01242da42..7710f5d21 100644
--- a/ansible_collections/cyberark/conjur/Jenkinsfile
+++ b/ansible_collections/cyberark/conjur/Jenkinsfile
@@ -8,11 +8,15 @@ pipeline {
     buildDiscarder(logRotator(numToKeepStr: '30'))
   }
 
+  triggers {
+    cron(getDailyCronString())
+  }
+
   stages {
     stage('Validate') {
       parallel {
         stage('Changelog') {
-          steps { sh './ci/parse-changelog.sh' }
+          steps { parseChangelog() }
         }
       }
     }
@@ -32,43 +36,94 @@ pipeline {
 
     stage('Run integration tests with Conjur Open Source') {
       stages {
-        stage('Ansible v6 - latest') {
-          parallel {
-            stage('Testing conjur_variable lookup plugin') {
+        stage('Ansible v8 (core 2.15) - latest') {
+          stages {
+            stage('Deploy Conjur') {
               steps {
-                sh './ci/test.sh -d conjur_variable'
-                junit 'tests/conjur_variable/junit/*'
+                sh './dev/start.sh -v 8'
               }
             }
+            stage('Run tests') {
+              parallel {
+                stage('Testing conjur_variable lookup plugin') {
+                  steps {
+                    sh './ci/test.sh -d -t conjur_variable'
+                    junit 'tests/conjur_variable/junit/*'
+                  }
+                }
 
-            stage('Testing conjur_host_identity role') {
-              steps {
-                sh './ci/test.sh -d conjur_host_identity'
-                junit 'roles/conjur_host_identity/tests/junit/*'
+                stage('Testing conjur_host_identity role') {
+                  steps {
+                    sh './ci/test.sh -d -t conjur_host_identity'
+                    junit 'roles/conjur_host_identity/tests/junit/*'
+                  }
+                }
               }
             }
           }
         }
 
-        stage('Ansible v5') {
+        stage('Ansible v7 (core 2.14)') {
           when {
             anyOf {
               branch 'main'
               buildingTag()
             }
           }
-          parallel {
-            stage('Testing conjur_variable lookup plugin') {
+          stages {
+            stage('Deploy Conjur') {
               steps {
-                sh './ci/test.sh -v 5 -d conjur_variable'
-                junit 'tests/conjur_variable/junit/*'
+                sh './dev/start.sh -v 7'
               }
             }
+            stage('Run tests') {
+              parallel {
+                stage('Testing conjur_variable lookup plugin') {
+                  steps {
+                    sh './ci/test.sh -d -t conjur_variable'
+                    junit 'tests/conjur_variable/junit/*'
+                  }
+                }
 
-            stage('Testing conjur_host_identity role') {
+                stage('Testing conjur_host_identity role') {
+                  steps {
+                    sh './ci/test.sh -d -t conjur_host_identity'
+                    junit 'roles/conjur_host_identity/tests/junit/*'
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        stage('Ansible v6 (core 2.13)') {
+          when {
+            anyOf {
+              branch 'main'
+              buildingTag()
+            }
+          }
+          stages {
+            stage('Deploy Conjur') {
               steps {
-                sh './ci/test.sh -v 5 -d conjur_host_identity'
-                junit 'roles/conjur_host_identity/tests/junit/*'
+                sh './dev/start.sh -v 6'
+              }
+            }
+            stage('Run tests') {
+              parallel {
+                stage('Testing conjur_variable lookup plugin') {
+                  steps {
+                    sh './ci/test.sh -d -t conjur_variable'
+                    junit 'tests/conjur_variable/junit/*'
+                  }
+                }
+
+                stage('Testing conjur_host_identity role') {
+                  steps {
+                    sh './ci/test.sh -d -t conjur_host_identity'
+                    junit 'roles/conjur_host_identity/tests/junit/*'
+                  }
+                }
               }
             }
           }
@@ -78,17 +133,26 @@ pipeline {
 
     stage('Run integration tests with Conjur Enterprise') {
       stages {
-        stage("Testing conjur_variable lookup plugin") {
+        stage('Deploy Conjur Enterprise') {
           steps {
-            sh './ci/test.sh -e -d conjur_variable'
-            junit 'tests/conjur_variable/junit/*'
+            sh './dev/start.sh -e -v 8'
           }
         }
+        stage('Run tests') {
+          parallel {
+            stage("Testing conjur_variable lookup plugin") {
+              steps {
+                sh './ci/test.sh -d -t conjur_variable'
+                junit 'tests/conjur_variable/junit/*'
+              }
+            }
 
-        stage("Testing conjur_host_identity role") {
-          steps {
-            sh './ci/test.sh -e -d conjur_host_identity'
-            junit 'roles/conjur_host_identity/tests/junit/*'
+            stage("Testing conjur_host_identity role") {
+              steps {
+                sh './ci/test.sh -d -t conjur_host_identity'
+                junit 'roles/conjur_host_identity/tests/junit/*'
+              }
+            }
           }
         }
       }