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

Adapt CI on RHEL-9 branch #3336

Merged
merged 8 commits into from
May 5, 2021
Merged

Conversation

jkonecny12
Copy link
Member

@jkonecny12 jkonecny12 commented May 4, 2021

Adapt rhel-9 branch for running tests. This patch set is doing this.

  • adapt Makefile variables after branching
  • remove packit support (I would like to enable it back when centos stream 9 is available)
  • adapt Dockerfiles to run tests on rhel-9
  • remove unnecessary stuff from Dockerfiles; like ELN support
  • remove unnecassary workflow files after branching
  • Adapt existing workflows to run tests on rhel-9

Test run.

jkonecny12 added 8 commits May 4, 2021 14:07
We want to add this back when CentOS Stream for 9 will be available.
Change where to get container image and solve COPR.
Dockerfiles were from F34. We want to leave them as close as possible but still
we need to change things like base container etc.

Main difference here is that we don't need to have ELN support in RHEL-9 so
remove these parts from Dockerfiles to simplify it.
We don't using this approach anymore. We are now connect VMs to the GitHub and
not just containers. This is one layer of complexity now which doesn't give us
any benefits.
We need to change this later to follow GA release.
Triggers other than `pull_request` and `pull_request_target` are working only
from the main branch and there is no benefit of having them here.
Use GitHub environment to gate the changes going in. We are using the same
solution on master branch now.

Use our self-hosted runners with access to required sources.
@jkonecny12 jkonecny12 added infrastructure Changes affecting mostly infrastructure rhel-9 labels May 4, 2021
@jkonecny12 jkonecny12 changed the title Rhel 9 adapt ci Adapt CI on RHEL-9 branch May 4, 2021
Copy link
Contributor

@VladimirSlavik VladimirSlavik left a comment

Choose a reason for hiding this comment

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

Looks good to me, thank you!

How about porting back some of the changes?

Comment on lines -44 to -48
# see https://github.com/martinpitt/anaconda/settings/actions/add-new-runner
RUN mkdir actions-runner && cd actions-runner && \
URL_BASE=https://github.com/actions/runner/releases && \
LATEST_VER=$(basename $(curl -Ls -o /dev/null -w '%{url_effective}' $URL_BASE/latest)) && \
curl -L "$URL_BASE/download/$LATEST_VER/actions-runner-linux-x64-${LATEST_VER#v}.tar.gz" | tar xvz
Copy link
Contributor

Choose a reason for hiding this comment

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

We should probably do this for the other branches, too?

Copy link
Member Author

@jkonecny12 jkonecny12 May 5, 2021

Choose a reason for hiding this comment

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

Correct. However, are we finished with the migration out of the github-ci workflow?

@@ -16,6 +16,7 @@ RUN set -e; \
rpm-build; \
curl -L https://raw.githubusercontent.com/rhinstaller/anaconda/${git_branch}/anaconda.spec.in | sed 's/@PACKAGE_VERSION@/0/; s/@PACKAGE_RELEASE@/0/; s/%{__python3}/python3/' > /tmp/anaconda.spec; \
rpmspec -q --buildrequires /tmp/anaconda.spec | xargs -d '\n' dnf install -y; \
dnf clean all; \
Copy link
Contributor

Choose a reason for hiding this comment

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

This too.

Copy link
Member Author

Choose a reason for hiding this comment

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

Definitely!

Copy link
Member Author

@jkonecny12 jkonecny12 May 5, 2021

Choose a reason for hiding this comment

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

backport: #3338

Copy link
Contributor

@poncovka poncovka left a comment

Choose a reason for hiding this comment

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

Looks good to me. Thanks!

@jkonecny12 jkonecny12 merged commit ccecf51 into rhinstaller:rhel-9 May 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
infrastructure Changes affecting mostly infrastructure rhel-9
Development

Successfully merging this pull request may close these issues.

3 participants