Skip to content

[v11] Backport dronegen changes for GitHub Actions#24788

Merged
camscale merged 4 commits intobranch/v11from
camh/v11/backport-dronegen-gha
Apr 19, 2023
Merged

[v11] Backport dronegen changes for GitHub Actions#24788
camscale merged 4 commits intobranch/v11from
camh/v11/backport-dronegen-gha

Conversation

@camscale
Copy link
Copy Markdown
Contributor

Backport a couple of partial PRs to more easily backport other changes
to branch/v11:

Ignore changes to the distroless OCI pipelines from those PRs as those
pipelines are not backported to branch/v11. But we do want the other
code changes to dronegen.

tcsc and others added 3 commits April 19, 2023 16:18
Make the GHA pipeline structure generic instead of assuming it only
calls the linux-arm64 workflows.

This backports part of dff5cd4 from
"Integrates distroless OCI publishing into drone (#22707)", but does not
backport the distroless OCI pipelines themselves.
Removes unnecessary workflow arguments from the Drone workflow
invocation. Refactors some of the `dronegen` generators to make
this easier to express insife `dronegen`

This backports "Fix OCI promotion (#22867)" without the changes
to the OCI pipelines as they have not been backported to v11.
Our ARM64 build fails quite frequently due to 30 minutes timeout. This PR increases the build timeout to one hour.
Comment thread dronegen/gha.go
cmd.WriteString(`-owner ${DRONE_REPO_OWNER} `)
cmd.WriteString(`-repo teleport.e `)
cmd.WriteString(`-tag-workflow `)
fmt.Fprintf(&cmd, `-timeout %s `, b.timeout.String())
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Did you run make dronegen? I see the timeout setting being added here but I don't see it anywhere in the .drone.yml in this changeset.

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Oops. Good catch. Fixed.

@camscale camscale added this pull request to the merge queue Apr 19, 2023
Merged via the queue into branch/v11 with commit d1dff20 Apr 19, 2023
@camscale camscale deleted the camh/v11/backport-dronegen-gha branch April 19, 2023 21:56
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.

5 participants