From a64ebc3d7a89e2bd9f77aa309dc445bd5422d200 Mon Sep 17 00:00:00 2001 From: Satya Bodapati Date: Wed, 14 May 2025 12:38:42 +0100 Subject: [PATCH] PKG-685 : jenkins-job-builder unable to publish if there is xml binary data in the YML file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Key Points: JJB ≥ 4.0.0 switched from PyYAML to ruamel.yaml for parsing, which treats !!binary differently JJB 3.x and earlier used PyYAML, which allowed !!binary for Base64-encoded data JJB 4.0.0+ no longer supports !!binary out-of-the-box with ruamel.yaml Fix: Convert Base64 decoded string to regular string and remove the !!binary --- .../percona-xtrabackup-8.0-compile-param.yml | 55 +++++++++++-------- .../jenkins/percona-xtrabackup-8.0-trunk.yml | 55 +++++++++++-------- 2 files changed, 64 insertions(+), 46 deletions(-) diff --git a/pxb/v2/jenkins/percona-xtrabackup-8.0-compile-param.yml b/pxb/v2/jenkins/percona-xtrabackup-8.0-compile-param.yml index 10d6c753b1..7b58468fb3 100644 --- a/pxb/v2/jenkins/percona-xtrabackup-8.0-compile-param.yml +++ b/pxb/v2/jenkins/percona-xtrabackup-8.0-compile-param.yml @@ -81,29 +81,38 @@ gunzip build.log.gz publishers: - raw: - xml: !!binary | - PGlvLmplbmtpbnMucGx1Z2lucy5hbmFseXNpcy5jb3JlLnN0ZXBzLklzc3Vlc1JlY29yZGVyIHBs - dWdpbj0id2FybmluZ3MtbmdAOS4wLjEiPgogICAgICA8YW5hbHlzaXNUb29scz4KICAgICAgICA8 - aW8uamVua2lucy5wbHVnaW5zLmFuYWx5c2lzLndhcm5pbmdzLkdjYzQ+CiAgICAgICAgICA8aWQg - Lz4KICAgICAgICAgIDxuYW1lIC8+CiAgICAgICAgICA8cGF0dGVybj4qKi9idWlsZC5sb2c8L3Bh - dHRlcm4+CiAgICAgICAgICA8cmVwb3J0RW5jb2RpbmcgLz4KICAgICAgICAgIDxza2lwU3ltYm9s - aWNMaW5rcz5mYWxzZTwvc2tpcFN5bWJvbGljTGlua3M+CiAgICAgICAgPC9pby5qZW5raW5zLnBs - dWdpbnMuYW5hbHlzaXMud2FybmluZ3MuR2NjND4KICAgICAgPC9hbmFseXNpc1Rvb2xzPgogICAg - ICA8c291cmNlQ29kZUVuY29kaW5nIC8+CiAgICAgIDxzb3VyY2VEaXJlY3RvcnkgLz4KICAgICAg - PGlnbm9yZVF1YWxpdHlHYXRlPmZhbHNlPC9pZ25vcmVRdWFsaXR5R2F0ZT4KICAgICAgPGlnbm9y - ZUZhaWxlZEJ1aWxkcz50cnVlPC9pZ25vcmVGYWlsZWRCdWlsZHM+CiAgICAgIDxmYWlsT25FcnJv - cj5mYWxzZTwvZmFpbE9uRXJyb3I+CiAgICAgIDxoZWFsdGh5PjA8L2hlYWx0aHk+CiAgICAgIDx1 - bmhlYWx0aHk+MDwvdW5oZWFsdGh5PgogICAgICA8bWluaW11bVNldmVyaXR5IHBsdWdpbj0iYW5h - bHlzaXMtbW9kZWwtYXBpQDEwLjAuMCI+CiAgICAgICAgPG5hbWU+TE9XPC9uYW1lPgogICAgICA8 - L21pbmltdW1TZXZlcml0eT4KICAgICAgPGZpbHRlcnMgLz4KICAgICAgPGlzRW5hYmxlZEZvckZh - aWx1cmU+dHJ1ZTwvaXNFbmFibGVkRm9yRmFpbHVyZT4KICAgICAgPGlzQWdncmVnYXRpbmdSZXN1 - bHRzPmZhbHNlPC9pc0FnZ3JlZ2F0aW5nUmVzdWx0cz4KICAgICAgPGlzQmxhbWVEaXNhYmxlZD5m - YWxzZTwvaXNCbGFtZURpc2FibGVkPgogICAgICA8c2tpcFB1Ymxpc2hpbmdDaGVja3M+ZmFsc2U8 - L3NraXBQdWJsaXNoaW5nQ2hlY2tzPgogICAgICA8cHVibGlzaEFsbElzc3Vlcz5mYWxzZTwvcHVi - bGlzaEFsbElzc3Vlcz4KICAgICAgPHF1YWxpdHlHYXRlcyAvPgogICAgICA8dHJlbmRDaGFydFR5 - cGU+QUdHUkVHQVRJT05fVE9PTFM8L3RyZW5kQ2hhcnRUeXBlPgogICAgICA8c2NtIC8+CiAgICA8 - L2lvLmplbmtpbnMucGx1Z2lucy5hbmFseXNpcy5jb3JlLnN0ZXBzLklzc3Vlc1JlY29yZGVyPgog - IA== + xml: | + + + + + + + **/build.log + + false + + + + + false + true + false + 0 + 0 + + LOW + + + true + false + false + false + false + + AGGREGATION_TOOLS + + - archive: artifacts: 'PIPELINE_BUILD_NUMBER' - archive: diff --git a/pxb/v2/jenkins/percona-xtrabackup-8.0-trunk.yml b/pxb/v2/jenkins/percona-xtrabackup-8.0-trunk.yml index 1c3efe559d..1130891e1f 100644 --- a/pxb/v2/jenkins/percona-xtrabackup-8.0-trunk.yml +++ b/pxb/v2/jenkins/percona-xtrabackup-8.0-trunk.yml @@ -51,29 +51,38 @@ echo "${TRIGGERED_BUILD_NUMBERS_percona_xtrabackup_8_0_test_param}" > TEST_PIPELINE_BUILD_NUMBER publishers: - raw: - xml: !!binary | - PGlvLmplbmtpbnMucGx1Z2lucy5hbmFseXNpcy5jb3JlLnN0ZXBzLklzc3Vlc1JlY29yZGVyIHBs - dWdpbj0id2FybmluZ3MtbmdAOS4wLjEiPgogICAgICA8YW5hbHlzaXNUb29scz4KICAgICAgICA8 - aW8uamVua2lucy5wbHVnaW5zLmFuYWx5c2lzLndhcm5pbmdzLkdjYzQ+CiAgICAgICAgICA8aWQg - Lz4KICAgICAgICAgIDxuYW1lIC8+CiAgICAgICAgICA8cGF0dGVybj4qKi9idWlsZC5sb2c8L3Bh - dHRlcm4+CiAgICAgICAgICA8cmVwb3J0RW5jb2RpbmcgLz4KICAgICAgICAgIDxza2lwU3ltYm9s - aWNMaW5rcz5mYWxzZTwvc2tpcFN5bWJvbGljTGlua3M+CiAgICAgICAgPC9pby5qZW5raW5zLnBs - dWdpbnMuYW5hbHlzaXMud2FybmluZ3MuR2NjND4KICAgICAgPC9hbmFseXNpc1Rvb2xzPgogICAg - ICA8c291cmNlQ29kZUVuY29kaW5nIC8+CiAgICAgIDxzb3VyY2VEaXJlY3RvcnkgLz4KICAgICAg - PGlnbm9yZVF1YWxpdHlHYXRlPmZhbHNlPC9pZ25vcmVRdWFsaXR5R2F0ZT4KICAgICAgPGlnbm9y - ZUZhaWxlZEJ1aWxkcz50cnVlPC9pZ25vcmVGYWlsZWRCdWlsZHM+CiAgICAgIDxmYWlsT25FcnJv - cj5mYWxzZTwvZmFpbE9uRXJyb3I+CiAgICAgIDxoZWFsdGh5PjA8L2hlYWx0aHk+CiAgICAgIDx1 - bmhlYWx0aHk+MDwvdW5oZWFsdGh5PgogICAgICA8bWluaW11bVNldmVyaXR5IHBsdWdpbj0iYW5h - bHlzaXMtbW9kZWwtYXBpQDEwLjAuMCI+CiAgICAgICAgPG5hbWU+TE9XPC9uYW1lPgogICAgICA8 - L21pbmltdW1TZXZlcml0eT4KICAgICAgPGZpbHRlcnMgLz4KICAgICAgPGlzRW5hYmxlZEZvckZh - aWx1cmU+dHJ1ZTwvaXNFbmFibGVkRm9yRmFpbHVyZT4KICAgICAgPGlzQWdncmVnYXRpbmdSZXN1 - bHRzPmZhbHNlPC9pc0FnZ3JlZ2F0aW5nUmVzdWx0cz4KICAgICAgPGlzQmxhbWVEaXNhYmxlZD5m - YWxzZTwvaXNCbGFtZURpc2FibGVkPgogICAgICA8c2tpcFB1Ymxpc2hpbmdDaGVja3M+ZmFsc2U8 - L3NraXBQdWJsaXNoaW5nQ2hlY2tzPgogICAgICA8cHVibGlzaEFsbElzc3Vlcz5mYWxzZTwvcHVi - bGlzaEFsbElzc3Vlcz4KICAgICAgPHF1YWxpdHlHYXRlcyAvPgogICAgICA8dHJlbmRDaGFydFR5 - cGU+QUdHUkVHQVRJT05fVE9PTFM8L3RyZW5kQ2hhcnRUeXBlPgogICAgICA8c2NtIC8+CiAgICA8 - L2lvLmplbmtpbnMucGx1Z2lucy5hbmFseXNpcy5jb3JlLnN0ZXBzLklzc3Vlc1JlY29yZGVyPgog - IA== + xml: | + + + + + + + **/build.log + + false + + + + + false + true + false + 0 + 0 + + LOW + + + true + false + false + false + false + + AGGREGATION_TOOLS + + - junit: results: "**/junit.xml" keep-long-stdio: true