@@ -197,8 +197,9 @@ def executeIntegrationTests() {
197197 if [ -z "${TEST_FILTER}" ]; then
198198 TEST_FILTER=*
199199 fi
200- # Limit DBAAS tests to Ubuntu 18.04
201- if [ "${OS_VERSION}" != "ubuntu/bionic64/cpp" ]; then
200+ # Limit DBAAS tests to Ubuntu only. We used to limit this to just Ubuntu 18.04 but any current
201+ # Ubuntu runner should have the necessary deps.
202+ if [ "${OS_VERSION}" != "ubuntu"* ]; then
202203 # Handle filters with negative filtering already applied
203204 if [[ "${TEST_FILTER}" == *":-"* ]]; then
204205 TEST_FILTER=${TEST_FILTER}:DbaasTests.*
@@ -443,10 +444,8 @@ pipeline {
443444 </table>''' )
444445 choice(
445446 name : ' OS_VERSION' ,
446- choices : [' centos/7-64/cpp' ,
447- ' rocky/8-64/cpp' ,
447+ choices : [' rocky/8-64/cpp' ,
448448 ' rocky/9-64/cpp' ,
449- ' ubuntu/bionic64/cpp' ,
450449 ' ubuntu/focal64/cpp' ,
451450 ' ubuntu/jammy64/cpp' ],
452451 description : ''' Operating system to use for scheduled or adhoc builds
@@ -457,10 +456,6 @@ pipeline {
457456 <th align="left">Choice</th>
458457 <th align="left">Description</th>
459458 </tr>
460- <tr>
461- <td><strong>centos/7-64/cpp</strong></td>
462- <td>CentOS 7 x86_64</td>
463- </tr>
464459 <tr>
465460 <td><strong>rocky/8-64/cpp</strong></td>
466461 <td>Rocky Linux 8 x86_64</td>
@@ -469,10 +464,6 @@ pipeline {
469464 <td><strong>rocky/9-64/cpp</strong></td>
470465 <td>Rocky Linux 9 x86_64</td>
471466 </tr>
472- <tr>
473- <td><strong>ubuntu/bionic64/cpp</strong></td>
474- <td>Ubuntu 18.04 LTS x86_64</td>
475- </tr>
476467 <tr>
477468 <td><strong>ubuntu/focal64/cpp</strong></td>
478469 <td>Ubuntu 20.04 LTS x86_64</td>
@@ -525,10 +516,8 @@ pipeline {
525516 axes {
526517 axis {
527518 name ' OS_VERSION'
528- values ' centos/7-64/cpp' ,
529- ' rocky/8-64/cpp' ,
519+ values ' rocky/8-64/cpp' ,
530520 ' rocky/9-64/cpp' ,
531- ' ubuntu/bionic64/cpp' ,
532521 ' ubuntu/focal64/cpp' ,
533522 ' ubuntu/jammy64/cpp'
534523 }
@@ -650,10 +639,8 @@ pipeline {
650639 axes {
651640 axis {
652641 name ' OS_VERSION'
653- values ' centos/7-64/cpp' ,
654- ' rocky/8-64/cpp' ,
642+ values ' rocky/8-64/cpp' ,
655643 ' rocky/9-64/cpp' ,
656- ' ubuntu/bionic64/cpp' ,
657644 ' ubuntu/focal64/cpp' ,
658645 ' ubuntu/jammy64/cpp'
659646 }
@@ -825,10 +812,10 @@ pipeline {
825812 }
826813
827814 environment {
828- OS_VERSION = ' ubuntu/bionic64 /cpp'
815+ OS_VERSION = ' ubuntu/jammy64 /cpp'
829816 }
830817 agent {
831- label ' ubuntu/bionic64 /cpp'
818+ label ' ubuntu/jammy64 /cpp'
832819 }
833820
834821 stages {
0 commit comments