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

bots: Drop docker resolv.conf hack #9040

Merged
merged 3 commits into from
Apr 25, 2018

Conversation

martinpitt
Copy link
Member

@martinpitt martinpitt commented Apr 24, 2018

https://bugzilla.redhat.com/show_bug.cgi?id=1448331 apparently got fixed
a while ago, and the hack is not necessary on any of our images any
more. Also, the resolv.conf creation hack was duplicated in a lot of
places.

Should this still happen in some special case, let's only do this in the
tests, not on the images, as they are much harder to change and clean
up.

Remove the hack from the Atomic images for now. It is still present in
{debian,fedora,openshift,rhel,selenium}.setup, these will be rebuilt and
cleaned up in separate pull requests.

  • image-refresh continuous-atomic
  • image-refresh rhel-atomic
  • image-refresh fedora-atomic

@martinpitt
Copy link
Member Author

Wow, that actually worked everywhere. Triggering continuous-atomic, fedora-26, and fedora-testing to have the full spectrum.

https://bugzilla.redhat.com/show_bug.cgi?id=1448331 apparently got fixed
a while ago, and the hack is not necessary on any of our images any
more. Also, the resolv.conf creation hack was duplicated in a lot of
places.

Should this still happen in some special case, let's only do this in the
tests, not on the images, as they are much harder to change and clean
up.

Remove the hack from the Atomic images for now. It is still present in
{debian,fedora,openshift,rhel,selenium}.setup, these will be rebuilt and
cleaned up in separate pull requests.

Closes cockpit-project#9040
@martinpitt martinpitt added the bot label Apr 25, 2018
@martinpitt martinpitt changed the title WIP: try docker without resolv.conf drop-in bots: Drop docker resolv.conf hack Apr 25, 2018
@cockpituous
Copy link
Contributor

image-refresh in progress on cockpit-tasks-sh8tm.
Log: http://fedorapeople.org/groups/cockpit/logs/image-refresh-9040-20180425-064343/

@cockpituous cockpituous changed the title bots: Drop docker resolv.conf hack WIP: cockpit-tasks-sh8tm: bots: Drop docker resolv.conf hack Apr 25, 2018
@martinpitt martinpitt changed the title WIP: cockpit-tasks-sh8tm: bots: Drop docker resolv.conf hack bots: Drop docker resolv.conf hack Apr 25, 2018
@martinpitt
Copy link
Member Author

I forgot, fedora-atomic is blocked by #9002. So let's only rebuild the other two atomics.

@cockpituous
Copy link
Contributor

image-refresh in progress on cockpit-tasks-mrr3b.
Log: http://fedorapeople.org/groups/cockpit/logs/image-refresh-9040-20180425-065050/

@cockpituous cockpituous changed the title bots: Drop docker resolv.conf hack WIP: cockpit-tasks-mrr3b: bots: Drop docker resolv.conf hack Apr 25, 2018
@cockpituous cockpituous changed the title WIP: cockpit-tasks-mrr3b: bots: Drop docker resolv.conf hack WIP: cockpit-tasks-fckv7: bots: Drop docker resolv.conf hack Apr 25, 2018
@cockpituous
Copy link
Contributor

image-refresh in progress on cockpit-tasks-fckv7.
Log: http://fedorapeople.org/groups/cockpit/logs/image-refresh-9040-20180425-065050/

@cockpituous
Copy link
Contributor

@cockpituous cockpituous changed the title WIP: cockpit-tasks-fckv7: bots: Drop docker resolv.conf hack bots: Drop docker resolv.conf hack Apr 25, 2018
@cockpituous
Copy link
Contributor

image-refresh in progress on cockpit-tasks-sh8tm.
Log: http://fedorapeople.org/groups/cockpit/logs/image-refresh-9040-20180425-070202/

@cockpituous cockpituous changed the title bots: Drop docker resolv.conf hack WIP: cockpit-tasks-sh8tm: bots: Drop docker resolv.conf hack Apr 25, 2018
@cockpituous
Copy link
Contributor

@cockpituous cockpituous changed the title WIP: cockpit-tasks-sh8tm: bots: Drop docker resolv.conf hack bots: Drop docker resolv.conf hack Apr 25, 2018
@cockpituous
Copy link
Contributor

image-refresh in progress on cockpit-tasks-npcrk.
Log: http://fedorapeople.org/groups/cockpit/logs/image-refresh-9040-20180425-070505/

@cockpituous cockpituous changed the title bots: Drop docker resolv.conf hack WIP: cockpit-tasks-npcrk: bots: Drop docker resolv.conf hack Apr 25, 2018
@cockpituous cockpituous changed the title WIP: cockpit-tasks-npcrk: bots: Drop docker resolv.conf hack WIP: cockpit-tasks-zj9p4: bots: Drop docker resolv.conf hack Apr 25, 2018
@cockpituous
Copy link
Contributor

image-refresh in progress on cockpit-tasks-zj9p4.
Log: http://fedorapeople.org/groups/cockpit/logs/image-refresh-9040-20180425-070505/

@cockpituous
Copy link
Contributor

@cockpituous cockpituous changed the title WIP: cockpit-tasks-zj9p4: bots: Drop docker resolv.conf hack bots: Drop docker resolv.conf hack Apr 25, 2018
@cockpituous
Copy link
Contributor

image-refresh in progress on cockpit-tasks-sh8tm.
Log: http://fedorapeople.org/groups/cockpit/logs/image-refresh-9040-20180425-071818/

@cockpituous cockpituous changed the title bots: Drop docker resolv.conf hack WIP: cockpit-tasks-sh8tm: bots: Drop docker resolv.conf hack Apr 25, 2018
@cockpituous
Copy link
Contributor

@cockpituous cockpituous changed the title WIP: cockpit-tasks-sh8tm: bots: Drop docker resolv.conf hack bots: Drop docker resolv.conf hack Apr 25, 2018
@cockpituous
Copy link
Contributor

martinpitt added a commit to martinpitt/cockpit that referenced this pull request Apr 25, 2018
https://bugzilla.redhat.com/show_bug.cgi?id=1448331 apparently got fixed
a while ago, and the hack is not necessary on any of our images any
more. Also, the resolv.conf creation hack was duplicated in a lot of
places.

Should this still happen in some special case, let's only do this in the
tests, not on the images, as they are much harder to change and clean
up.

Remove the hack from the Atomic images for now. It is still present in
{debian,fedora,openshift,rhel,selenium}.setup, these will be rebuilt and
cleaned up in separate pull requests.

Closes cockpit-project#9040
martinpitt added a commit to martinpitt/cockpit that referenced this pull request Apr 25, 2018
Copy link
Contributor

@larskarlitski larskarlitski left a comment

Choose a reason for hiding this comment

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

Thanks!

@larskarlitski larskarlitski merged commit 83d50a4 into cockpit-project:master Apr 25, 2018
larskarlitski pushed a commit that referenced this pull request Apr 25, 2018
https://bugzilla.redhat.com/show_bug.cgi?id=1448331 apparently got fixed
a while ago, and the hack is not necessary on any of our images any
more. Also, the resolv.conf creation hack was duplicated in a lot of
places.

Should this still happen in some special case, let's only do this in the
tests, not on the images, as they are much harder to change and clean
up.

Remove the hack from the Atomic images for now. It is still present in
{debian,fedora,openshift,rhel,selenium}.setup, these will be rebuilt and
cleaned up in separate pull requests.

Closes #9040
@martinpitt martinpitt deleted the docker-cleanup branch April 25, 2018 12:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants