Merge "Add e2e test job for ephemeral cluster"

diff --git a/jjb/cloud-infra/openstack-jobs/openstack-verify-package.yaml b/jjb/cloud-infra/openstack-jobs/openstack-verify-package.yaml
index b29b7a395306ad26c1b6518832ae2269636f78ed..2267959778bdcb90899703ecc500cae6a9e4dea7 100644 (file)
--- a/jjb/cloud-infra/openstack-jobs/openstack-verify-package.yaml
+++ b/jjb/cloud-infra/openstack-jobs/openstack-verify-package.yaml
@@ -152,6 +152,9 @@
               credential-id: 'nordix-cicd-arm-credentials'
               username: NORDIX_ARM_USERNAME
               password: NORDIX_ARM_TOKEN
+      - ssh-agent-credentials:
+          users:
+            - 'nordixinfra-lfn-gerrit-ssh'
       - mask-passwords
       - pre-scm-buildstep:
           failOnError: true

diff --git a/jjb/infra/update-jenkins-slave.sh b/jjb/infra/update-jenkins-slave.sh
index 9473aae00d7e794bcda484c6946217c41a9287ac..a9b649b2cb8eebc76ac4b42146b848cbc7870417 100644 (file)
--- a/jjb/infra/update-jenkins-slave.sh
+++ b/jjb/infra/update-jenkins-slave.sh
@@ -3,6 +3,20 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
+DPKG_LOCK="/var/lib/dpkg/lock-frontend"
+# Wait for other apt process to finish by checking the dpkg lock file.
+try=0
+while sudo lsof ${DPKG_LOCK}  > /dev/null 2>&1 ; do
+  echo "DPKG file locked: ${DPKG_LOCK}."
+  echo "   Waiting for another pkg instalaltion process to finish ..."
+  sleep 10
+  if [[ ${try} -gt 60 ]] ; then
+    echo "ERROR: Max number of re-tries reached, exiting..."
+    exit 1
+  fi
+  try=$((try + 1))
+done
+
 sudo apt install -y -q=3 python3-minimal python3-pip virtualenv
 
 # workaround for https://github.com/pypa/virtualenv/issues/1029
@@ -35,4 +49,4 @@ echo "Info: Updating the CI slave image"
 cd "infra/jenkins/slave-setup/${TARGET}/"
 packer validate *-ubuntu*.json
 packer build *-ubuntu*.json
-echo "----------------------------------------------------"
\ No newline at end of file
+echo "----------------------------------------------------"

diff --git a/jjb/metal3/job_bml_main_integration_tests.yml b/jjb/metal3/job_bml_main_integration_tests.yml
index a40174e51abb2711c578725a5c67755ae28360de..51c8f9c05b3b4b8a71b86c1f1184b12d5c3b280c 100644 (file)
--- a/jjb/metal3/job_bml_main_integration_tests.yml
+++ b/jjb/metal3/job_bml_main_integration_tests.yml
@@ -44,7 +44,7 @@
         description: 'Project github repo name'
     - string:
         name: ghprbActualCommit
-        default: 'master'
+        default: 'main'
         description: 'CI Repo branch for triggering manual build'
     - string:
         name: ghprbAuthorRepoGitUrl
@@ -52,7 +52,7 @@
         description: 'CI Repo URL for triggering manual build'
     - string:
         name: ghprbTargetBranch
-        default: 'master'
+        default: 'main'
         description: 'Target branch of the PR'
     - string:
         name: IMAGE_OS

diff --git a/jjb/metal3/job_metal3_dev_tools_integration_test.yml b/jjb/metal3/job_metal3_dev_tools_integration_test.yml
index 4ff6dc2c2e9d581c8127f3cb12c4f1aeb71f6801..9743b2443f371fe09701a4b3407f8d32b0f6f359 100644 (file)
--- a/jjb/metal3/job_metal3_dev_tools_integration_test.yml
+++ b/jjb/metal3/job_metal3_dev_tools_integration_test.yml
@@ -72,7 +72,7 @@
         description: 'RAM size of the target host.'
     - string:
         name: KUBERNETES_VERSION
-        default: "v1.23.3"
+        default: ""
         description: 'Kubernetes version'
 
     properties:

diff --git a/jjb/metal3/projects.yml b/jjb/metal3/projects.yml
index b8ad712f128bdb2a61f9496e22f8c243d1c829ec..6d68ce1734a26bd658c29293f5362b5566e91670 100644 (file)
--- a/jjb/metal3/projects.yml
+++ b/jjb/metal3/projects.yml
@@ -256,4 +256,4 @@
                 capi_version: v1alpha4
                 capm3_version: v1alpha5
                 capm3_branch: release-0.5
-                schedule: "H 20 * * *"
+                schedule: "H 23 * * *"