Skip to content

Commit

Permalink
Update AmazonLinux 2 EOL
Browse files Browse the repository at this point in the history
  • Loading branch information
@mayeut
mayeut committed Jan 4, 2025
1 parent 289c4f5 commit 6a803c2
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions DETAILS.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
.. |alt-p9| image:: https://img.shields.io/static/v1?label=alt&message=p9%20(unknown)&color=lightgray
.. |alt-p8| image:: https://img.shields.io/static/v1?label=alt&message=p8%20(unknown)&color=lightgray
.. |amazonlinux-2023| image:: https://img.shields.io/static/v1?label=amazonlinux&message=2023%20(EOL%3A2028-03-15)&color=green&logo=amazon-aws&logoColor=white
.. |amazonlinux-2| image:: https://img.shields.io/static/v1?label=amazonlinux&message=2%20(EOL%3A2025-06-30)&color=green&logo=amazon-aws&logoColor=white
.. |amazonlinux-2| image:: https://img.shields.io/static/v1?label=amazonlinux&message=2%20(EOL%3A2026-06-30)&color=green&logo=amazon-aws&logoColor=white
.. |amazonlinux-1| image:: https://img.shields.io/static/v1?label=amazonlinux&message=1%20(EOL%3A2020-12-31%20/%20LTS%3A2023-12-31)&color=black&logo=amazon-aws&logoColor=white
.. |archlinux-latest| image:: https://img.shields.io/static/v1?label=archlinux&message=latest%20(rolling)&color=purple&logo=arch-linux&logoColor=white
.. |centos-stream10| image:: https://img.shields.io/static/v1?label=centos&message=stream10%20(rolling)&color=purple&logo=centos&logoColor=white
Expand Down Expand Up @@ -64,7 +64,7 @@
.. |manylinux-1| image:: https://img.shields.io/static/v1?label=manylinux&message=1%20(EOL%3A2017-03-31)&color=black&logo=python&logoColor=white
.. |opensuse-tumbleweed| image:: https://img.shields.io/static/v1?label=opensuse&message=tumbleweed%20(rolling)&color=purple&logo=opensuse&logoColor=white
.. |opensuse-15.6| image:: https://img.shields.io/static/v1?label=opensuse&message=15.6%20(EOL%3A2025-12-31)&color=green&logo=opensuse&logoColor=white
.. |opensuse-15.5| image:: https://img.shields.io/static/v1?label=opensuse&message=15.5%20(EOL%3A2024-12-31)&color=yellow&logo=opensuse&logoColor=white
.. |opensuse-15.5| image:: https://img.shields.io/static/v1?label=opensuse&message=15.5%20(EOL%3A2024-12-31)&color=black&logo=opensuse&logoColor=white
.. |opensuse-15.4| image:: https://img.shields.io/static/v1?label=opensuse&message=15.4%20(EOL%3A2023-12-07)&color=black&logo=opensuse&logoColor=white
.. |opensuse-15.3| image:: https://img.shields.io/static/v1?label=opensuse&message=15.3%20(EOL%3A2022-12-01)&color=black&logo=opensuse&logoColor=white
.. |opensuse-15.2| image:: https://img.shields.io/static/v1?label=opensuse&message=15.2%20(EOL%3A2021-12-01)&color=black&logo=opensuse&logoColor=white
Expand All @@ -76,8 +76,8 @@
.. |opensuse-13.2| image:: https://img.shields.io/static/v1?label=opensuse&message=13.2%20(EOL%3A2017-01-17)&color=black&logo=opensuse&logoColor=white
.. |oraclelinux-9| image:: https://img.shields.io/static/v1?label=oraclelinux&message=9%20(EOL%3A2032-06-30%20/%20ELTS%3A2035-06-30)&color=green&logo=oracle&logoColor=white
.. |oraclelinux-8| image:: https://img.shields.io/static/v1?label=oraclelinux&message=8%20(EOL%3A2029-07-31%20/%20ELTS%3A2032-07-31)&color=green&logo=oracle&logoColor=white
.. |oraclelinux-7| image:: https://img.shields.io/static/v1?label=oraclelinux&message=7%20(EOL%3A2024-12-31%20/%20ELTS%3A2028-06-30)&color=yellow&logo=oracle&logoColor=white
.. |oraclelinux-6| image:: https://img.shields.io/static/v1?label=oraclelinux&message=6%20(EOL%3A2021-03-31%20/%20ELTS%3A2024-12-31)&color=red&logo=oracle&logoColor=white
.. |oraclelinux-7| image:: https://img.shields.io/static/v1?label=oraclelinux&message=7%20(EOL%3A2024-12-31%20/%20ELTS%3A2028-06-30)&color=red&logo=oracle&logoColor=white
.. |oraclelinux-6| image:: https://img.shields.io/static/v1?label=oraclelinux&message=6%20(EOL%3A2021-03-31%20/%20ELTS%3A2024-12-31)&color=black&logo=oracle&logoColor=white
.. |photon-5.0| image:: https://img.shields.io/static/v1?label=photon&message=5.0%20(unknown)&color=lightgray&logo=vmware&logoColor=white
.. |photon-4.0| image:: https://img.shields.io/static/v1?label=photon&message=4.0%20(EOL%3A2026-03-01)&color=green&logo=vmware&logoColor=white
.. |photon-3.0| image:: https://img.shields.io/static/v1?label=photon&message=3.0%20(EOL%3A2024-03-01)&color=black&logo=vmware&logoColor=white
Expand Down
2 changes: 1 addition & 1 deletion EOL.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ This mostly mimics Debian lifecycle.
:header: "distro", "EOL", "LTS", "ELTS"

"amazonlinux 2023", "2028-03-15", "", ""
"amazonlinux 2", "2025-06-30", "", ""
"amazonlinux 2", "2026-06-30", "", ""
"amazonlinux 1", "2020-12-31", "2023-12-31", ""
.. csv-table:: archlinux
:header: "distro", "EOL", "LTS", "ELTS"
Expand Down
8 changes: 4 additions & 4 deletions README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
.. |alt-p9| image:: https://img.shields.io/static/v1?label=alt&message=p9%20(unknown)&color=lightgray
.. |alt-p8| image:: https://img.shields.io/static/v1?label=alt&message=p8%20(unknown)&color=lightgray
.. |amazonlinux-2023| image:: https://img.shields.io/static/v1?label=amazonlinux&message=2023%20(EOL%3A2028-03-15)&color=green&logo=amazon-aws&logoColor=white
.. |amazonlinux-2| image:: https://img.shields.io/static/v1?label=amazonlinux&message=2%20(EOL%3A2025-06-30)&color=green&logo=amazon-aws&logoColor=white
.. |amazonlinux-2| image:: https://img.shields.io/static/v1?label=amazonlinux&message=2%20(EOL%3A2026-06-30)&color=green&logo=amazon-aws&logoColor=white
.. |amazonlinux-1| image:: https://img.shields.io/static/v1?label=amazonlinux&message=1%20(EOL%3A2020-12-31%20/%20LTS%3A2023-12-31)&color=black&logo=amazon-aws&logoColor=white
.. |archlinux-latest| image:: https://img.shields.io/static/v1?label=archlinux&message=latest%20(rolling)&color=purple&logo=arch-linux&logoColor=white
.. |centos-stream10| image:: https://img.shields.io/static/v1?label=centos&message=stream10%20(rolling)&color=purple&logo=centos&logoColor=white
Expand Down Expand Up @@ -69,7 +69,7 @@
.. |manylinux-1| image:: https://img.shields.io/static/v1?label=manylinux&message=1%20(EOL%3A2017-03-31)&color=black&logo=python&logoColor=white
.. |opensuse-tumbleweed| image:: https://img.shields.io/static/v1?label=opensuse&message=tumbleweed%20(rolling)&color=purple&logo=opensuse&logoColor=white
.. |opensuse-15.6| image:: https://img.shields.io/static/v1?label=opensuse&message=15.6%20(EOL%3A2025-12-31)&color=green&logo=opensuse&logoColor=white
.. |opensuse-15.5| image:: https://img.shields.io/static/v1?label=opensuse&message=15.5%20(EOL%3A2024-12-31)&color=yellow&logo=opensuse&logoColor=white
.. |opensuse-15.5| image:: https://img.shields.io/static/v1?label=opensuse&message=15.5%20(EOL%3A2024-12-31)&color=black&logo=opensuse&logoColor=white
.. |opensuse-15.4| image:: https://img.shields.io/static/v1?label=opensuse&message=15.4%20(EOL%3A2023-12-07)&color=black&logo=opensuse&logoColor=white
.. |opensuse-15.3| image:: https://img.shields.io/static/v1?label=opensuse&message=15.3%20(EOL%3A2022-12-01)&color=black&logo=opensuse&logoColor=white
.. |opensuse-15.2| image:: https://img.shields.io/static/v1?label=opensuse&message=15.2%20(EOL%3A2021-12-01)&color=black&logo=opensuse&logoColor=white
Expand All @@ -81,8 +81,8 @@
.. |opensuse-13.2| image:: https://img.shields.io/static/v1?label=opensuse&message=13.2%20(EOL%3A2017-01-17)&color=black&logo=opensuse&logoColor=white
.. |oraclelinux-9| image:: https://img.shields.io/static/v1?label=oraclelinux&message=9%20(EOL%3A2032-06-30%20/%20ELTS%3A2035-06-30)&color=green&logo=oracle&logoColor=white
.. |oraclelinux-8| image:: https://img.shields.io/static/v1?label=oraclelinux&message=8%20(EOL%3A2029-07-31%20/%20ELTS%3A2032-07-31)&color=green&logo=oracle&logoColor=white
.. |oraclelinux-7| image:: https://img.shields.io/static/v1?label=oraclelinux&message=7%20(EOL%3A2024-12-31%20/%20ELTS%3A2028-06-30)&color=yellow&logo=oracle&logoColor=white
.. |oraclelinux-6| image:: https://img.shields.io/static/v1?label=oraclelinux&message=6%20(EOL%3A2021-03-31%20/%20ELTS%3A2024-12-31)&color=red&logo=oracle&logoColor=white
.. |oraclelinux-7| image:: https://img.shields.io/static/v1?label=oraclelinux&message=7%20(EOL%3A2024-12-31%20/%20ELTS%3A2028-06-30)&color=red&logo=oracle&logoColor=white
.. |oraclelinux-6| image:: https://img.shields.io/static/v1?label=oraclelinux&message=6%20(EOL%3A2021-03-31%20/%20ELTS%3A2024-12-31)&color=black&logo=oracle&logoColor=white
.. |photon-5.0| image:: https://img.shields.io/static/v1?label=photon&message=5.0%20(unknown)&color=lightgray&logo=vmware&logoColor=white
.. |photon-4.0| image:: https://img.shields.io/static/v1?label=photon&message=4.0%20(EOL%3A2026-03-01)&color=green&logo=vmware&logoColor=white
.. |photon-3.0| image:: https://img.shields.io/static/v1?label=photon&message=3.0%20(EOL%3A2024-03-01)&color=black&logo=vmware&logoColor=white
Expand Down
2 changes: 1 addition & 1 deletion pep600_compliance/images/os/amazonlinux.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def install_packages(self, container, machine):
# standard eol: https://aws.amazon.com/fr/amazon-linux-2/faqs/
AmazonLinux(
"amazonlinux:2",
("EOL:2025-06-30",),
("EOL:2026-06-30",),
machines=("x86_64", "aarch64"),
pkg_manager=package_manager.YUM(),
packages=[
Expand Down

0 comments on commit 6a803c2

Please sign in to comment.