From 8b7e36fca0327fbd10310b36e8380f0e4ed44222 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Fri, 18 Oct 2024 14:51:15 +0530 Subject: [PATCH 01/27] Upgrade fluent bit version to 3.1.9 --- versions/common.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/common.yml b/versions/common.yml index 7ea346f0..aeb21ce7 100644 --- a/versions/common.yml +++ b/versions/common.yml @@ -1,4 +1,4 @@ -fbVersion: 3.1.2 +fbVersion: 3.1.9 # This file, together with each distro file are processed and merged incrementally to # build all the information required to download and test each package. Each package ends From 7fccf559f79868bdc584ad198195a4bdb32597db Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Fri, 18 Oct 2024 16:07:10 +0530 Subject: [PATCH 02/27] Upgrade upload-artifact version to v3 since v2 is deprecated --- .github/workflows/prerelease.yml | 6 +++--- .github/workflows/pull_request.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/prerelease.yml b/.github/workflows/prerelease.yml index 6467054d..0ac56bb7 100644 --- a/.github/workflows/prerelease.yml +++ b/.github/workflows/prerelease.yml @@ -57,7 +57,7 @@ jobs: sudo apt-get install -y debsigs bash ./scripts/sign.sh - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: ${{ contains(matrix.packages.available-flavors, env.FB_PACKAGE_NAME) }} with: name: ${{ env.FB_PACKAGE_NAME }}_${{ env.VERSION }}_rpm @@ -100,7 +100,7 @@ jobs: sudo apt-get install -y debsigs bash ./scripts/sign.sh - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 if: ${{ contains(matrix.packages.available-flavors, env.FB_PACKAGE_NAME) }} with: name: ${{ env.FB_PACKAGE_NAME }}_${{ env.VERSION }}_deb @@ -128,7 +128,7 @@ jobs: unzip fluent-bit-${{ env.VERSION }}-${{ matrix.packages.version }}.zip zip -r -j packages/fb-windows-${{ matrix.packages.arch }}.zip fluent-bit-${{ env.VERSION }}-${{ matrix.packages.version }}/bin/fluent-bit.exe fluent-bit-${{ env.VERSION }}-${{ matrix.packages.version }}/bin/fluent-bit.dll - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: name: fluent-bit_${{ env.VERSION }}_zip path: packages/ diff --git a/.github/workflows/pull_request.yml b/.github/workflows/pull_request.yml index 885bcf19..dff9783b 100644 --- a/.github/workflows/pull_request.yml +++ b/.github/workflows/pull_request.yml @@ -119,7 +119,7 @@ jobs: # for those distros using the same package, such as Windows). To avoid this, we first push all the files to a # shared filesystem and let the "prepare_prerelease" step below upload them later, sequentially. This GH action # ensures that if two jobs attempt pushing the same file, they get overwritten (last one prevails). - - uses: actions/upload-artifact@v2 + - uses: actions/upload-artifact@v3 with: # Artifacts are pushed to *shared network folders* that have this name and that contain # the artifact inside of them. Example: fluent-bit-2.1.8-386.exe/fluent-bit-2.1.8-386.exe From f80eae8a3a8ef7c177122714b2cbb1dc78edb07b Mon Sep 17 00:00:00 2001 From: Lucas Date: Mon, 21 Oct 2024 12:06:16 +0200 Subject: [PATCH 03/27] NR-328274: use updated falcon role --- ansible/build-fb-suse/requirements.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ansible/build-fb-suse/requirements.yml b/ansible/build-fb-suse/requirements.yml index fff66ed3..ad2a2e61 100644 --- a/ansible/build-fb-suse/requirements.yml +++ b/ansible/build-fb-suse/requirements.yml @@ -1,7 +1,7 @@ collections: - name: community.aws - name: community.general - - name: git+https://github.com/Sivakumar3695/caos-ansible-roles#/caos.ansible_roles/ + - name: git+https://github.com/luckslovez/caos-ansible-roles#/caos.ansible_roles/ type: git roles: - name: andrewrothstein.gh From e1d40d177be54a2b0f4cb21085502190d949c317 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Wed, 23 Oct 2024 14:46:13 +0530 Subject: [PATCH 04/27] dd zypper debug --- ansible/build-fb-suse/playbook.yml | 40 +++++++++++++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/ansible/build-fb-suse/playbook.yml b/ansible/build-fb-suse/playbook.yml index 8e40b82d..b7248780 100644 --- a/ansible/build-fb-suse/playbook.yml +++ b/ansible/build-fb-suse/playbook.yml @@ -38,6 +38,23 @@ tasks: - name: Wait for connection to be available wait_for_connection: + - name: Debug repository configuration + command: zypper repos + register: repo_output + ignore_errors: yes + + - name: Print repository configuration + debug: + var: repo_output.stdout_lines + + - name: Refresh repositories + command: zypper refresh + register: refresh_output + ignore_errors: yes + + - name: Print refresh output + debug: + var: refresh_output.stdout_lines - name: Install dependencies community.general.zypper: @@ -58,9 +75,30 @@ become: true register: install_status until: install_status is success - # Retry up to 5 minutes, because at startup the zypper command might temporarily hold a lock that prevents installing packages delay: 15 retries: 20 + # - name: Install dependencies + # community.general.zypper: + # name: + # - git + # - flex + # - wget + # - libyaml-devel + # - libopenssl-devel + # - systemd-devel + # - gcc + # - gcc-c++ + # - rpmbuild + # - "{{ cpp_with_version }}" + # state: present + # oldpackage: true + # force_resolution: true + # become: true + # register: install_status + # until: install_status is success + # # Retry up to 5 minutes, because at startup the zypper command might temporarily hold a lock that prevents installing packages + # delay: 15 + # retries: 20 - name: Download and extract Bison {{ bison_version }} unarchive: From f854ff1d491e4be225038ed73783ae7d96825bae Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Thu, 24 Oct 2024 18:49:36 +0530 Subject: [PATCH 05/27] add only sles workflow files --- versions/strategyMatrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index 4e4f47e8..88090ab3 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -186,7 +186,7 @@ def list_distro_files(): return [ filename for filename in os.listdir(".") - if (filename.endswith(".yml") or filename.endswith(".yaml")) + if (filename.startswith("sles")) and filename != "common.yml" ] except Exception as e: From feb9b4d6de10d481c8a107cd6f540583534b5db3 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Fri, 25 Oct 2024 15:12:15 +0530 Subject: [PATCH 06/27] add timeout 900 --- ansible/build-fb-suse/playbook.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ansible/build-fb-suse/playbook.yml b/ansible/build-fb-suse/playbook.yml index b7248780..59b3e087 100644 --- a/ansible/build-fb-suse/playbook.yml +++ b/ansible/build-fb-suse/playbook.yml @@ -38,6 +38,7 @@ tasks: - name: Wait for connection to be available wait_for_connection: + timeout: 900 - name: Debug repository configuration command: zypper repos register: repo_output From 270994bca0c3bdeac705fede37dc7a7982f9cb89 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Fri, 25 Oct 2024 16:08:44 +0530 Subject: [PATCH 07/27] update strategy matrix to pick sles_15.4 --- versions/strategyMatrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index 88090ab3..5aff825e 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -186,7 +186,7 @@ def list_distro_files(): return [ filename for filename in os.listdir(".") - if (filename.startswith("sles")) + if (filename.startswith("sles_15.4")) and filename != "common.yml" ] except Exception as e: From df64c50a4537e1cfe67f3a7ffd3c8ea119170f4a Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Fri, 25 Oct 2024 16:31:53 +0530 Subject: [PATCH 08/27] Update playbook.yml --- ansible/build-fb-suse/playbook.yml | 35 +++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/ansible/build-fb-suse/playbook.yml b/ansible/build-fb-suse/playbook.yml index 59b3e087..0f68d0b2 100644 --- a/ansible/build-fb-suse/playbook.yml +++ b/ansible/build-fb-suse/playbook.yml @@ -38,11 +38,32 @@ tasks: - name: Wait for connection to be available wait_for_connection: - timeout: 900 + timeout: 600 + + - name: Debug repository configuration + command: zypper repos + register: repo_output + ignore_errors: yes + changed_when: false + + - debug: + msg: "{{ repo_output.stdout_lines }}" + + # Add Zypper repositories based on the OS version + - name: Add Zypper repository for SLES 15 SP4 + when: os_version == "15.4" + zypper_repository: + name: "SUSE-PackageHub-15-SP4" + description: "SUSE Package Hub 15 SP4" + baseurl: "https://download.opensuse.org/repositories/SUSE:/SLE-15-SP4:/GA/standard/" + gpgcheck: yes + repo: "https://download.opensuse.org/repositories/SUSE:/SLE-15-SP4:/GA/standard/" + - name: Debug repository configuration command: zypper repos register: repo_output ignore_errors: yes + changed_when: false - name: Print repository configuration debug: @@ -71,13 +92,17 @@ - rpmbuild - "{{ cpp_with_version }}" state: present + update_cache: yes oldpackage: true force_resolution: true become: true - register: install_status - until: install_status is success - delay: 15 - retries: 20 + register: install_output + until: install_output.rc == 0 + delay: 30 + retries: 5 + + - debug: + msg: "{{ install_output.stdout }}" # - name: Install dependencies # community.general.zypper: # name: From a5e6bdcf463e0f26ed8bfe4586409ac1d4df4651 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Fri, 25 Oct 2024 16:42:01 +0530 Subject: [PATCH 09/27] Update playbook.yml --- ansible/build-fb-suse/playbook.yml | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/ansible/build-fb-suse/playbook.yml b/ansible/build-fb-suse/playbook.yml index 0f68d0b2..6e810d00 100644 --- a/ansible/build-fb-suse/playbook.yml +++ b/ansible/build-fb-suse/playbook.yml @@ -54,9 +54,9 @@ when: os_version == "15.4" zypper_repository: name: "SUSE-PackageHub-15-SP4" - description: "SUSE Package Hub 15 SP4" - baseurl: "https://download.opensuse.org/repositories/SUSE:/SLE-15-SP4:/GA/standard/" - gpgcheck: yes + description: "SUSE Package Hub 15 SP4" + auto_import_keys: yes + autorefresh: yes repo: "https://download.opensuse.org/repositories/SUSE:/SLE-15-SP4:/GA/standard/" - name: Debug repository configuration @@ -77,29 +77,24 @@ - name: Print refresh output debug: var: refresh_output.stdout_lines - + - name: Install dependencies - community.general.zypper: + zypper: name: - git - flex - - wget - libyaml-devel - libopenssl-devel - systemd-devel - gcc - gcc-c++ - rpmbuild - - "{{ cpp_with_version }}" state: present update_cache: yes - oldpackage: true - force_resolution: true - become: true + retries: 10 + delay: 30 register: install_output until: install_output.rc == 0 - delay: 30 - retries: 5 - debug: msg: "{{ install_output.stdout }}" From 1b0b58dc79f09850e44d43aeff755954fabd79d4 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Fri, 25 Oct 2024 16:57:43 +0530 Subject: [PATCH 10/27] updating ami --- ansible/build-fb-suse/playbook.yml | 16 ++++++++-------- versions/sles_15.4.yml | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/ansible/build-fb-suse/playbook.yml b/ansible/build-fb-suse/playbook.yml index 6e810d00..b271f34f 100644 --- a/ansible/build-fb-suse/playbook.yml +++ b/ansible/build-fb-suse/playbook.yml @@ -50,14 +50,14 @@ msg: "{{ repo_output.stdout_lines }}" # Add Zypper repositories based on the OS version - - name: Add Zypper repository for SLES 15 SP4 - when: os_version == "15.4" - zypper_repository: - name: "SUSE-PackageHub-15-SP4" - description: "SUSE Package Hub 15 SP4" - auto_import_keys: yes - autorefresh: yes - repo: "https://download.opensuse.org/repositories/SUSE:/SLE-15-SP4:/GA/standard/" + # - name: Add Zypper repository for SLES 15 SP4 + # when: os_version == "15.4" + # zypper_repository: + # name: "SUSE-PackageHub-15-SP4" + # description: "SUSE Package Hub 15 SP4" + # auto_import_keys: yes + # autorefresh: yes + # repo: "https://download.opensuse.org/repositories/SUSE:/SLE-15-SP4:/GA/standard/" - name: Debug repository configuration command: zypper repos diff --git a/versions/sles_15.4.yml b/versions/sles_15.4.yml index 36b529a4..24045819 100644 --- a/versions/sles_15.4.yml +++ b/versions/sles_15.4.yml @@ -2,4 +2,4 @@ osDistro: sles osVersion: 15.4 packages: - arch: x86_64 - ami: ami-04bec2ee7152c1c8c \ No newline at end of file + ami: ami-0f48f109f1e6a8a4c \ No newline at end of file From 16f88f579be684a721021996ff2b93e8dcddc13f Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Fri, 25 Oct 2024 17:12:05 +0530 Subject: [PATCH 11/27] reverting the changes made related to configuration --- ansible/build-fb-suse/playbook.yml | 82 +++++------------------------- 1 file changed, 12 insertions(+), 70 deletions(-) diff --git a/ansible/build-fb-suse/playbook.yml b/ansible/build-fb-suse/playbook.yml index b271f34f..000b82ac 100644 --- a/ansible/build-fb-suse/playbook.yml +++ b/ansible/build-fb-suse/playbook.yml @@ -38,88 +38,30 @@ tasks: - name: Wait for connection to be available wait_for_connection: - timeout: 600 + timeout: 600 - - name: Debug repository configuration - command: zypper repos - register: repo_output - ignore_errors: yes - changed_when: false - - - debug: - msg: "{{ repo_output.stdout_lines }}" - - # Add Zypper repositories based on the OS version - # - name: Add Zypper repository for SLES 15 SP4 - # when: os_version == "15.4" - # zypper_repository: - # name: "SUSE-PackageHub-15-SP4" - # description: "SUSE Package Hub 15 SP4" - # auto_import_keys: yes - # autorefresh: yes - # repo: "https://download.opensuse.org/repositories/SUSE:/SLE-15-SP4:/GA/standard/" - - - name: Debug repository configuration - command: zypper repos - register: repo_output - ignore_errors: yes - changed_when: false - - - name: Print repository configuration - debug: - var: repo_output.stdout_lines - - - name: Refresh repositories - command: zypper refresh - register: refresh_output - ignore_errors: yes - - - name: Print refresh output - debug: - var: refresh_output.stdout_lines - - name: Install dependencies - zypper: + community.general.zypper: name: - git - flex + - wget - libyaml-devel - libopenssl-devel - systemd-devel - gcc - gcc-c++ - rpmbuild + - "{{ cpp_with_version }}" state: present - update_cache: yes - retries: 10 - delay: 30 - register: install_output - until: install_output.rc == 0 - - - debug: - msg: "{{ install_output.stdout }}" - # - name: Install dependencies - # community.general.zypper: - # name: - # - git - # - flex - # - wget - # - libyaml-devel - # - libopenssl-devel - # - systemd-devel - # - gcc - # - gcc-c++ - # - rpmbuild - # - "{{ cpp_with_version }}" - # state: present - # oldpackage: true - # force_resolution: true - # become: true - # register: install_status - # until: install_status is success - # # Retry up to 5 minutes, because at startup the zypper command might temporarily hold a lock that prevents installing packages - # delay: 15 - # retries: 20 + oldpackage: true + force_resolution: true + become: true + register: install_status + until: install_status is success + # Retry up to 5 minutes, because at startup the zypper command might temporarily hold a lock that prevents installing packages + delay: 15 + retries: 20 - name: Download and extract Bison {{ bison_version }} unarchive: From c2b4586975c4c71e31e2971a04969eb1616eecdc Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Fri, 25 Oct 2024 17:58:59 +0530 Subject: [PATCH 12/27] Testing it with sles 15.1 --- versions/strategyMatrix.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index 5aff825e..93dcf2a4 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -186,7 +186,7 @@ def list_distro_files(): return [ filename for filename in os.listdir(".") - if (filename.startswith("sles_15.4")) + if (filename.startswith("sles_15.4") or filename.startswith("sles_15.1")) and filename != "common.yml" ] except Exception as e: From dfb3c967b1be9c453b199a38b6c35e6094341be0 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Fri, 25 Oct 2024 19:02:09 +0530 Subject: [PATCH 13/27] modifying AMIs to latest ones --- versions/{sles_12.1.yml => sles_12.1.ymlx} | 0 versions/{sles_12.2.yml => sles_12.2.ymlx} | 0 versions/{sles_12.3.yml => sles_12.3.ymlx} | 0 versions/{sles_12.4.yml => sles_12.4.ymlx} | 0 versions/{sles_15.1.yml => sles_15.1.ymlx} | 0 versions/sles_15.2.yml | 2 +- versions/sles_15.3.yml | 2 +- versions/strategyMatrix.py | 4 ++-- 8 files changed, 4 insertions(+), 4 deletions(-) rename versions/{sles_12.1.yml => sles_12.1.ymlx} (100%) rename versions/{sles_12.2.yml => sles_12.2.ymlx} (100%) rename versions/{sles_12.3.yml => sles_12.3.ymlx} (100%) rename versions/{sles_12.4.yml => sles_12.4.ymlx} (100%) rename versions/{sles_15.1.yml => sles_15.1.ymlx} (100%) diff --git a/versions/sles_12.1.yml b/versions/sles_12.1.ymlx similarity index 100% rename from versions/sles_12.1.yml rename to versions/sles_12.1.ymlx diff --git a/versions/sles_12.2.yml b/versions/sles_12.2.ymlx similarity index 100% rename from versions/sles_12.2.yml rename to versions/sles_12.2.ymlx diff --git a/versions/sles_12.3.yml b/versions/sles_12.3.ymlx similarity index 100% rename from versions/sles_12.3.yml rename to versions/sles_12.3.ymlx diff --git a/versions/sles_12.4.yml b/versions/sles_12.4.ymlx similarity index 100% rename from versions/sles_12.4.yml rename to versions/sles_12.4.ymlx diff --git a/versions/sles_15.1.yml b/versions/sles_15.1.ymlx similarity index 100% rename from versions/sles_15.1.yml rename to versions/sles_15.1.ymlx diff --git a/versions/sles_15.2.yml b/versions/sles_15.2.yml index 973b6a9d..adb8597d 100644 --- a/versions/sles_15.2.yml +++ b/versions/sles_15.2.yml @@ -2,4 +2,4 @@ osDistro: sles osVersion: 15.2 packages: - arch: x86_64 - ami: ami-0b53003810daecb6d \ No newline at end of file + ami: ami-0e18f96a0cd806b3d \ No newline at end of file diff --git a/versions/sles_15.3.yml b/versions/sles_15.3.yml index 4d13b9a8..ff50413b 100644 --- a/versions/sles_15.3.yml +++ b/versions/sles_15.3.yml @@ -2,4 +2,4 @@ osDistro: sles osVersion: 15.3 packages: - arch: x86_64 - ami: ami-0d80ccb98990ccf53 \ No newline at end of file + ami: ami-048206b517bb4a5c2 \ No newline at end of file diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index 93dcf2a4..f7a3c7f3 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -185,8 +185,8 @@ def list_distro_files(): try: return [ filename - for filename in os.listdir(".") - if (filename.startswith("sles_15.4") or filename.startswith("sles_15.1")) + for filename in os.listdir(".") + if (filename.endswith(".yml") or filename.endswith(".yaml")) and filename != "common.yml" ] except Exception as e: From a5df9262ec54c8dbfaa2b6d00f4de0cd536ea2f6 Mon Sep 17 00:00:00 2001 From: Rajeev Kumar Date: Fri, 25 Oct 2024 20:18:38 +0530 Subject: [PATCH 14/27] updated SLES 15.2 version --- ansible/build-fb-suse/playbook.yml | 2 +- versions/sles_15.2.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/build-fb-suse/playbook.yml b/ansible/build-fb-suse/playbook.yml index 000b82ac..46277e04 100644 --- a/ansible/build-fb-suse/playbook.yml +++ b/ansible/build-fb-suse/playbook.yml @@ -38,7 +38,7 @@ tasks: - name: Wait for connection to be available wait_for_connection: - timeout: 600 + timeout: 900 - name: Install dependencies community.general.zypper: diff --git a/versions/sles_15.2.yml b/versions/sles_15.2.yml index adb8597d..693b8af9 100644 --- a/versions/sles_15.2.yml +++ b/versions/sles_15.2.yml @@ -2,4 +2,4 @@ osDistro: sles osVersion: 15.2 packages: - arch: x86_64 - ami: ami-0e18f96a0cd806b3d \ No newline at end of file + ami: ami-0fa138c5605d78459 # TODO: This AMI is from publisher kurian. Need to confirm with security team before making it to production. \ No newline at end of file From ddf66840983109247213867872b5340bc43e3605 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Sat, 26 Oct 2024 18:47:38 +0530 Subject: [PATCH 15/27] update sles 15.2 ami --- versions/sles_15.2.yml | 2 +- versions/strategyMatrix.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/versions/sles_15.2.yml b/versions/sles_15.2.yml index 693b8af9..9384ffa3 100644 --- a/versions/sles_15.2.yml +++ b/versions/sles_15.2.yml @@ -2,4 +2,4 @@ osDistro: sles osVersion: 15.2 packages: - arch: x86_64 - ami: ami-0fa138c5605d78459 # TODO: This AMI is from publisher kurian. Need to confirm with security team before making it to production. \ No newline at end of file + ami: ami-00b024865d4182ab8 # TODO: This AMI is from publisher kurian. Need to confirm with security team before making it to production. \ No newline at end of file diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index f7a3c7f3..830b19ce 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -186,7 +186,7 @@ def list_distro_files(): return [ filename for filename in os.listdir(".") - if (filename.endswith(".yml") or filename.endswith(".yaml")) + if (filename.startswith("sles_15.2")) and filename != "common.yml" ] except Exception as e: From 3ff7024b4a2a2cc396e6978095cd20f2a8203dfa Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Sat, 26 Oct 2024 19:15:01 +0530 Subject: [PATCH 16/27] update 15.2 sles ami --- versions/sles_15.2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/sles_15.2.yml b/versions/sles_15.2.yml index 9384ffa3..7beed29b 100644 --- a/versions/sles_15.2.yml +++ b/versions/sles_15.2.yml @@ -2,4 +2,4 @@ osDistro: sles osVersion: 15.2 packages: - arch: x86_64 - ami: ami-00b024865d4182ab8 # TODO: This AMI is from publisher kurian. Need to confirm with security team before making it to production. \ No newline at end of file + ami: ami-0378ff074a795701d # TODO: This AMI is from publisher kurian. Need to confirm with security team before making it to production. \ No newline at end of file From e90395926e0d125a5125e2fcc3852507a06dc6f8 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Sun, 27 Oct 2024 19:22:12 +0530 Subject: [PATCH 17/27] update sles 15.2 ami --- versions/sles_15.2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/sles_15.2.yml b/versions/sles_15.2.yml index 7beed29b..bb3bc570 100644 --- a/versions/sles_15.2.yml +++ b/versions/sles_15.2.yml @@ -2,4 +2,4 @@ osDistro: sles osVersion: 15.2 packages: - arch: x86_64 - ami: ami-0378ff074a795701d # TODO: This AMI is from publisher kurian. Need to confirm with security team before making it to production. \ No newline at end of file + ami: ami-06728afdd143525ba # TODO: This AMI is from publisher kurian. Need to confirm with security team before making it to production. \ No newline at end of file From e1ef2863b744a241acb36b3f104d639d3a73519f Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Sun, 27 Oct 2024 19:41:08 +0530 Subject: [PATCH 18/27] update sles 15.2 ami --- versions/sles_15.2.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions/sles_15.2.yml b/versions/sles_15.2.yml index bb3bc570..afa9317a 100644 --- a/versions/sles_15.2.yml +++ b/versions/sles_15.2.yml @@ -2,4 +2,4 @@ osDistro: sles osVersion: 15.2 packages: - arch: x86_64 - ami: ami-06728afdd143525ba # TODO: This AMI is from publisher kurian. Need to confirm with security team before making it to production. \ No newline at end of file + ami: ami-03bb89b7d26709c14 # TODO: This AMI is from publisher kurian. Need to confirm with security team before making it to production. \ No newline at end of file From 570c6f52a6530067bce0c8c58980a3a825f0a05a Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Mon, 28 Oct 2024 15:53:14 +0530 Subject: [PATCH 19/27] rename sles_15.2.yml to sles_15.2.ymlx to remove the file --- versions/{sles_15.2.yml => sles_15.2.ymlx} | 0 versions/strategyMatrix.py | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename versions/{sles_15.2.yml => sles_15.2.ymlx} (100%) diff --git a/versions/sles_15.2.yml b/versions/sles_15.2.ymlx similarity index 100% rename from versions/sles_15.2.yml rename to versions/sles_15.2.ymlx diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index 830b19ce..f7a3c7f3 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -186,7 +186,7 @@ def list_distro_files(): return [ filename for filename in os.listdir(".") - if (filename.startswith("sles_15.2")) + if (filename.endswith(".yml") or filename.endswith(".yaml")) and filename != "common.yml" ] except Exception as e: From 14a09b0e5277a7b10015bf8c2f04733b84ce6f68 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Mon, 28 Oct 2024 15:59:06 +0530 Subject: [PATCH 20/27] remove timeout --- ansible/build-fb-suse/playbook.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/ansible/build-fb-suse/playbook.yml b/ansible/build-fb-suse/playbook.yml index 46277e04..8e40b82d 100644 --- a/ansible/build-fb-suse/playbook.yml +++ b/ansible/build-fb-suse/playbook.yml @@ -38,7 +38,6 @@ tasks: - name: Wait for connection to be available wait_for_connection: - timeout: 900 - name: Install dependencies community.general.zypper: From 9a33bf9d1ea1b5df7379db3d2491ce9c4f27e9f7 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Mon, 28 Oct 2024 22:14:28 +0530 Subject: [PATCH 21/27] disable windows-server-2019 and 2022 --- .../{windows-server-2019.yml => windows-server-2019.yml.disabled} | 0 .../{windows-server-2022.yml => windows-server-2022.yml.disabled} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename versions/{windows-server-2019.yml => windows-server-2019.yml.disabled} (100%) rename versions/{windows-server-2022.yml => windows-server-2022.yml.disabled} (100%) diff --git a/versions/windows-server-2019.yml b/versions/windows-server-2019.yml.disabled similarity index 100% rename from versions/windows-server-2019.yml rename to versions/windows-server-2019.yml.disabled diff --git a/versions/windows-server-2022.yml b/versions/windows-server-2022.yml.disabled similarity index 100% rename from versions/windows-server-2022.yml rename to versions/windows-server-2022.yml.disabled From 397643da2e84acfe8be6b6bf8a0f4e434cc80851 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Tue, 29 Oct 2024 09:52:02 +0530 Subject: [PATCH 22/27] update windows-server amis --- ...ndows-server-2019.yml.disabled => windows-server-2019.yml} | 4 ++-- ...ndows-server-2022.yml.disabled => windows-server-2022.yml} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename versions/{windows-server-2019.yml.disabled => windows-server-2019.yml} (74%) rename versions/{windows-server-2022.yml.disabled => windows-server-2022.yml} (57%) diff --git a/versions/windows-server-2019.yml.disabled b/versions/windows-server-2019.yml similarity index 74% rename from versions/windows-server-2019.yml.disabled rename to versions/windows-server-2019.yml index ca3b5cb2..5078a6c8 100644 --- a/versions/windows-server-2019.yml.disabled +++ b/versions/windows-server-2019.yml @@ -2,7 +2,7 @@ osDistro: windows-server osVersion: 2019 packages: - arch: win64 - ami: ami-0cd3008ce2e0d1c0c + ami: ami-04a0f66869c37da73 # There is no win32 image available in AWS, so we use the w64 one to test the w32 binaries - arch: win32 - ami: ami-0cd3008ce2e0d1c0c \ No newline at end of file + ami: ami-0131f8b98ba082b3b \ No newline at end of file diff --git a/versions/windows-server-2022.yml.disabled b/versions/windows-server-2022.yml similarity index 57% rename from versions/windows-server-2022.yml.disabled rename to versions/windows-server-2022.yml index 9a13e444..2b10e9ba 100644 --- a/versions/windows-server-2022.yml.disabled +++ b/versions/windows-server-2022.yml @@ -2,6 +2,6 @@ osDistro: windows-server osVersion: 2022 packages: - arch: win64 - ami: ami-094aa6728b151e05a + ami: ami-0c808db6baea2d0ed - arch: win32 - ami: ami-094aa6728b151e05a + ami: ami-0c25be66a8d4215e5 From b2dadf075264351e0b8186296f43ce4600079c7b Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Tue, 29 Oct 2024 14:19:32 +0530 Subject: [PATCH 23/27] remove windows-servers --- .../{windows-server-2019.yml => windows-server-2019.yml.disabled} | 0 .../{windows-server-2022.yml => windows-server-2022.yml.disabled} | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename versions/{windows-server-2019.yml => windows-server-2019.yml.disabled} (100%) rename versions/{windows-server-2022.yml => windows-server-2022.yml.disabled} (100%) diff --git a/versions/windows-server-2019.yml b/versions/windows-server-2019.yml.disabled similarity index 100% rename from versions/windows-server-2019.yml rename to versions/windows-server-2019.yml.disabled diff --git a/versions/windows-server-2022.yml b/versions/windows-server-2022.yml.disabled similarity index 100% rename from versions/windows-server-2022.yml rename to versions/windows-server-2022.yml.disabled From 0a6998484d8141622a1a90e3613eb785a59d2cc3 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Tue, 29 Oct 2024 17:01:28 +0530 Subject: [PATCH 24/27] check /tmp/test-reports directory exists --- ansible/provision-and-execute-tests/playbook-merge-results.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ansible/provision-and-execute-tests/playbook-merge-results.yml b/ansible/provision-and-execute-tests/playbook-merge-results.yml index 2d1507d4..53a658e0 100644 --- a/ansible/provision-and-execute-tests/playbook-merge-results.yml +++ b/ansible/provision-and-execute-tests/playbook-merge-results.yml @@ -18,6 +18,9 @@ nvm_install: "curl" nvm_commands: - "cd {{ controller_scripts_folder }} && nvm exec default npm install" + - name: Ensure test reports directory exists + ansible.builtin.file: + path: "{{ test_reports_dir }}" - name: Process test reports ansible.builtin.shell: "source ~/.nvm/nvm.sh && nvm exec default npm start" From 87289c10a6a867f16c84f7822d9b767738d2cecd Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Tue, 29 Oct 2024 17:57:14 +0530 Subject: [PATCH 25/27] remove 15.5 sles --- ansible/provision-and-execute-tests/playbook-merge-results.yml | 3 --- versions/{sles_15.5.yml => sles_15.5.ymlx} | 0 2 files changed, 3 deletions(-) rename versions/{sles_15.5.yml => sles_15.5.ymlx} (100%) diff --git a/ansible/provision-and-execute-tests/playbook-merge-results.yml b/ansible/provision-and-execute-tests/playbook-merge-results.yml index 53a658e0..2d1507d4 100644 --- a/ansible/provision-and-execute-tests/playbook-merge-results.yml +++ b/ansible/provision-and-execute-tests/playbook-merge-results.yml @@ -18,9 +18,6 @@ nvm_install: "curl" nvm_commands: - "cd {{ controller_scripts_folder }} && nvm exec default npm install" - - name: Ensure test reports directory exists - ansible.builtin.file: - path: "{{ test_reports_dir }}" - name: Process test reports ansible.builtin.shell: "source ~/.nvm/nvm.sh && nvm exec default npm start" diff --git a/versions/sles_15.5.yml b/versions/sles_15.5.ymlx similarity index 100% rename from versions/sles_15.5.yml rename to versions/sles_15.5.ymlx From 73778f5c2fa04026c6383149fd51e23c3e32c792 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Wed, 30 Oct 2024 09:05:42 +0530 Subject: [PATCH 26/27] uncomment windows-servers-2019 , 2022 , update amazon-linux-2023 ami , comment centos 7 and 8 --- versions/amazonlinux_2023.yml | 2 +- versions/{centos_7.yml => centos_7.ymlx} | 0 versions/{centos_8.yml => centos_8.ymlx} | 0 ...windows-server-2019.yml.disabled => windows-server-2019.yml} | 0 ...windows-server-2022.yml.disabled => windows-server-2022.yml} | 0 5 files changed, 1 insertion(+), 1 deletion(-) rename versions/{centos_7.yml => centos_7.ymlx} (100%) rename versions/{centos_8.yml => centos_8.ymlx} (100%) rename versions/{windows-server-2019.yml.disabled => windows-server-2019.yml} (100%) rename versions/{windows-server-2022.yml.disabled => windows-server-2022.yml} (100%) diff --git a/versions/amazonlinux_2023.yml b/versions/amazonlinux_2023.yml index a3ccad56..0963ec6c 100644 --- a/versions/amazonlinux_2023.yml +++ b/versions/amazonlinux_2023.yml @@ -2,6 +2,6 @@ osDistro: amazonlinux osVersion: 2023 packages: - arch: x86_64 - ami: ami-01103fb68b3569475 + ami: ami-0798fb070bcaff6e9 - arch: aarch64 ami: ami-0b9df99d3514cdede diff --git a/versions/centos_7.yml b/versions/centos_7.ymlx similarity index 100% rename from versions/centos_7.yml rename to versions/centos_7.ymlx diff --git a/versions/centos_8.yml b/versions/centos_8.ymlx similarity index 100% rename from versions/centos_8.yml rename to versions/centos_8.ymlx diff --git a/versions/windows-server-2019.yml.disabled b/versions/windows-server-2019.yml similarity index 100% rename from versions/windows-server-2019.yml.disabled rename to versions/windows-server-2019.yml diff --git a/versions/windows-server-2022.yml.disabled b/versions/windows-server-2022.yml similarity index 100% rename from versions/windows-server-2022.yml.disabled rename to versions/windows-server-2022.yml From 3e33451df215e3c6729e8e6b1e48e7c8b791ec74 Mon Sep 17 00:00:00 2001 From: HEMAGUNNALA Date: Wed, 30 Oct 2024 12:30:21 +0530 Subject: [PATCH 27/27] uncomment centos 7 and 8 --- versions/{centos_7.ymlx => centos_7.yml} | 0 versions/{centos_8.ymlx => centos_8.yml} | 0 versions/strategyMatrix.py | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) rename versions/{centos_7.ymlx => centos_7.yml} (100%) rename versions/{centos_8.ymlx => centos_8.yml} (100%) diff --git a/versions/centos_7.ymlx b/versions/centos_7.yml similarity index 100% rename from versions/centos_7.ymlx rename to versions/centos_7.yml diff --git a/versions/centos_8.ymlx b/versions/centos_8.yml similarity index 100% rename from versions/centos_8.ymlx rename to versions/centos_8.yml diff --git a/versions/strategyMatrix.py b/versions/strategyMatrix.py index f7a3c7f3..04b55a96 100644 --- a/versions/strategyMatrix.py +++ b/versions/strategyMatrix.py @@ -186,7 +186,7 @@ def list_distro_files(): return [ filename for filename in os.listdir(".") - if (filename.endswith(".yml") or filename.endswith(".yaml")) + if (filename.statswith("centos_")) and filename != "common.yml" ] except Exception as e: