Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

docker: Add centos7 to dockerstatic dockerfiles #3402

Merged
merged 7 commits into from
Jul 2, 2024

Conversation

Haroon-Khel
Copy link
Contributor

@Haroon-Khel Haroon-Khel commented Feb 19, 2024

  • commit message has one of the standard prefixes
  • faq.md updated if appropriate
  • other documentation is changed or added (if applicable)
  • playbook changes run through VPC or QPC (if you have access)
  • VPC/QPC not applicable for this PR
  • for inventory.yml changes, bastillion/nagios/jenkins updated accordingly

Security support for centos7 ends in June of this year, so its worth having a few containers on our machines until then
https://endoflife.date/centos

Copy link
Member

@sxa sxa left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I didn't realise we didn't already have one of these so yeah if it is suitable for passing the tests I'm ok with adding it for a few months :-)

@Haroon-Khel
Copy link
Contributor Author

@Haroon-Khel
Copy link
Contributor Author

Its git version is quite old

[root@664a8be7aebb ~]# git --version
git version 1.8.3.1

Causing problems with tests https://ci.adoptium.net/job/Test_openjdk17_hs_sanity.functional_x86-64_linux/405/console

12:28:26  get functional test material...
12:28:26  git clone --depth 1 --reference-if-able /home/jenkins/openjdk_cache -b master https://github.com/eclipse-openj9/openj9.git
12:28:26  error: unknown option `reference-if-able'
12:28:26  usage: git clone [options] [--] <repo> [<dir>]
12:28:26  
12:28:26      -v, --verbose         be more verbose
12:28:26      -q, --quiet           be more quiet
12:28:26      --progress            force progress reporting

karianna
karianna previously approved these changes Feb 19, 2024
@karianna karianna dismissed their stale review February 19, 2024 20:50

Failing tests

Copy link
Contributor

@steelhead31 steelhead31 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I suspect this will need the changes made here to update the eol centos7 repositories.. see this PR: https://github.com/adoptium/infrastructure/pull/3647/files 

RUN sed -i -e 's!mirrorlist!#mirrorlist!g' /etc/yum.repos.d/CentOS-Base.repo

RUN if [ "$(uname -m)" = "aarch64" ]; then \
     echo "Running on arm64 architecture"; \
     sed -i 's|#baseurl=http://mirror.centos.org/altarch/\$releasever/|baseurl=http://vault.centos.org/altarch/7.9.2009/|' /etc/yum.repos.d/CentOS-Base.repo; \
   elif [ "$(uname -m)" = "ppc64le" ]; then \
     echo "Running on ppc64le architecture"; \
     sed -i 's|#baseurl=http://mirror.centos.org/altarch/\$releasever/|baseurl=http://vault.centos.org/altarch/7.9.2009/|' /etc/yum.repos.d/CentOS-Base.repo; \
   else \
     # Default To x64; \
     echo "Running on another architecture"; \
     sed -i -e 's!#baseurl=http://mirror.centos.org/centos/\$releasever!baseurl=https://vault.centos.org/7.9.2009/!g' /etc/yum.repos.d/CentOS-Base.repo; \
   fi

Copy link
Contributor

@steelhead31 steelhead31 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks ok.

@Haroon-Khel
Copy link
Contributor Author

Dont merge yet. I am adding steps to install git 2.15.0 form source since the latest git that can be installed on centos7 is 1.8 which is too old to run tests

@Haroon-Khel Haroon-Khel merged commit 35dc8ff into adoptium:master Jul 2, 2024
18 checks passed
@Haroon-Khel Haroon-Khel self-assigned this Jul 2, 2024
@Haroon-Khel Haroon-Khel deleted the centos7.dockerfile branch July 2, 2024 15:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
No open projects
Status: Done
Development

Successfully merging this pull request may close these issues.

4 participants