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

Jump to bottom

nixos/gitlab-runner: add support for 'docker+machine' and 'docker-ssh+machine' executors #108763

Merged
merged 1 commit into from Jan 26, 2021
Merged

nixos/gitlab-runner: add support for 'docker+machine' and 'docker-ssh+machine' executors #108763

merged 1 commit into from Jan 26, 2021

Conversation

misuzu
Copy link
Contributor

@misuzu misuzu commented Jan 8, 2021 •
edited

Closes: #108759

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@MartinPotier
Copy link
Contributor

alternative PR #108762

@misuzu misuzu mentioned this pull request Jan 8, 2021
Closed
@misuzu misuzu marked this pull request as ready for review January 8, 2021 11:10
@misuzu misuzu mentioned this pull request Jan 8, 2021
Closed
10 tasks
MartinPotier
MartinPotier approved these changes Jan 8, 2021
View reviewed changes
Copy link
Contributor

@MartinPotier MartinPotier left a comment

Choose a reason for hiding this comment

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

This fixes a bigger class of problems than the other PR, let's keep this one.

@MartinPotier
Copy link
Contributor

Tested with success!

@MartinPotier
Copy link
Contributor

@misuzu should we invite another reviewer in order to get this merged?

@misuzu misuzu requested a review from zimbatm January 12, 2021 14:29
@zimbatm zimbatm merged commit 1e38f0b into NixOS:master Jan 26, 2021
globin pushed a commit to mayflower/nixpkgs that referenced this pull request Mar 27, 2021
@misuzu @globin
nixos/gitlab-runner: add support for 'docker+machine' and 'docker-ssh…
677c436 
…+machine' executors (NixOS#108763)

(cherry picked from commit 1e38f0b)
@misuzu misuzu deleted the gitlab-runner-module branch April 22, 2021 21:16
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MartinPotier MartinPotier MartinPotier approved these changes

@zimbatm zimbatm Awaiting requested review from zimbatm

Assignees
No one assigned
Labels
6.topic: nixos 8.has: module (update) 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

gitlab-runner module: the dockerImage is also mandatory for the “docker+machine” executor
3 participants
@misuzu @MartinPotier @zimbatm