Skip to content

Conversation

@cgwalters
Copy link
Member

We had separate code cleaning up:

  • disk snapshots
  • rendered ignition config
  • swtpm

Since the swtpm code was already always making a directory, just
generalize that and use it for everything so we only have one
directory to remove.

Came out of discussion in
#1393

We had separate code cleaning up:

 - disk snapshots
 - rendered ignition config
 - swtpm

Since the swtpm code was already always making a directory, just
generalize that and use it for everything so we only have one
directory to remove.

Came out of discussion in
coreos#1393
Copy link
Contributor

@darkmuggle darkmuggle left a comment

Choose a reason for hiding this comment

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

While adding the nbd code, I really wanted to do this, but kept the scope smaller.
Thank you for working on it @cgwalters

/lgtm

@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ashcrow, cgwalters, darkmuggle

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:
  • OWNERS [ashcrow,cgwalters,darkmuggle]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-merge-robot openshift-merge-robot merged commit 3d51185 into coreos:master Apr 24, 2020
@dustymabe
Copy link
Member

We are seeing issues in our archive stage in the FCOS pipeline. The ultimate error is IsADirectoryError: [Errno 21] Is a directory: 'builds/32.20200427.10.0/x86_64/swtpm'.

Possibly related to this PR?

cgwalters added a commit to cgwalters/coreos-assembler that referenced this pull request Apr 27, 2020
FCOS pipeline is seeing `swtpm/` directory in the working dir:
coreos#1399 (comment)

I didn't reproduce but this should fix it.
@cgwalters
Copy link
Member Author

#1406

openshift-merge-robot pushed a commit that referenced this pull request Apr 28, 2020
FCOS pipeline is seeing `swtpm/` directory in the working dir:
#1399 (comment)

I didn't reproduce but this should fix it.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants