Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
base: 84a2463499d7
Choose a base ref
...
head repository: NixOS/nixpkgs
compare: bb94d419fb2a
Choose a head ref
  • 2 commits
  • 1 file changed
  • 1 contributor

Commits on Dec 3, 2018

  1. nixos/jenkins-job-builder: stop reloadScript on error 

    Currently there are two calls to curl in the reloadScript, neither which
check for errors. If something is misconfigured (like wrong authToken),
the only trace that something wrong happened is this log message:

  Asking Jenkins to reload config
  <h1>Bad Message 400</h1><pre>reason: Illegal character VCHAR='<'</pre>

The service isn't marked as failed, so it's easy to miss.

Fix it by passing --fail to curl.

While at it:
* Add $curl_opts and $jenkins_url variables to keep the curl command
  lines DRY.
* Add --show-error to curl to show short error message explanation when
  things go wrong (like HTTP 401 error).
* Lower-case the $CRUMB variable as upper case is for exported environment
  variables.

The new behaviour, when having wrong accessToken:

  Asking Jenkins to reload config
  curl: (22) The requested URL returned error: 401

And the service is clearly marked as failed in `systemctl --failed`.
    @bjornfor
    bjornfor committed Dec 3, 2018
    Copy the full SHA
    8ebfd5c View commit details
    Browse the repository at this point in the history

  2. nixos/jenkins-job-builder: add accessTokenFile option 

    The new option allows storing the secret access token outside the world
readable Nix store.
    @bjornfor
    bjornfor committed Dec 3, 2018
    Copy the full SHA
    bb94d41 View commit details
    Browse the repository at this point in the history