Skip to content

Commit

Permalink
Merge branch 'master' into pr/5172
Browse files Browse the repository at this point in the history
* master: (912 commits)
  Update redirects.txt
  Added redirect for Spark guide link
  client: log when server list changes
  docs: mention regression in task config validation
  fix update to changelog
  update CHANGELOG with datacenter config validation #5665
  typo: "atleast" -> "at least"
  implement nomad exec for rkt
  docs: fixed typo
  use pty/tty terminology similar to github.com/kr/pty
  vendor github.com/kr/pty
  drivers: implement streaming exec for executor based drivers
  executors: implement streaming exec
  executor: scaffolding for executor grpc handling
  client: expose allocated memory per task
  client improve a comment in updateNetworks
  stalebot: Add 'thinking' as an exempt label (#5684)
  Added Sparrow link
  update links to use new canonical location
  Add redirects for restructing done in GH-5667
  ...
  • Loading branch information
nickethier committed May 14, 2019
2 parents a5e7725 + 315beb6 commit e30cc90
Show file tree
Hide file tree
Showing 1,299 changed files with 78,422 additions and 43,107 deletions.
5 changes: 5 additions & 0 deletions .github/CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Code of Conduct

HashiCorp Community Guidelines apply to you when interacting with the community here on GitHub and contributing code.

Please read the full text at https://www.hashicorp.com/community-guidelines
16 changes: 14 additions & 2 deletions ISSUE_TEMPLATE.md → .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,20 @@ Output from `nomad version`

### Reproduction steps

### Nomad Server logs (if appropriate)
### Job file (if appropriate)

### Nomad Client logs (if appropriate)
If possible please post relevant logs in the issue.

### Job file (if appropriate)
Logs and other artifacts may also be sent to: nomad-oss-debug@hashicorp.com

Please link to your Github issue in the email and reference it in the subject
line:

> To: nomad-oss-debug@hashicorp.com
>
> Subject: GH-1234: Errors garbage collecting allocs
Emails sent to that address are readable by all HashiCorp employees but are *not* publicly visible.

### Nomad Server logs (if appropriate)
35 changes: 35 additions & 0 deletions .github/stale.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# Number of days of inactivity before an Issue or Pull Request becomes stale
daysUntilStale: 90

# Number of days of inactivity before an Issue or Pull Request with the stale label is closed.
# Set to false to disable. If disabled, issues still need to be closed manually, but will remain marked as stale.
daysUntilClose: 30

# Issues or Pull Requests with these labels will never be considered stale. Set to `[]` to disable
# We don't close any issue that is an enhancement or confirmed bug, but issues waiting for reproduction
# cases and questions tend to get outdated.
exemptLabels:
- "enhancement"
- "bug"
- "thinking"

# Label to use when marking as stale
staleLabel: "waiting-reply"

# Comment to post when marking as stale. Set to `false` to disable
markComment: |
Hey there
Since this issue hasn't had any activity in a while - we're going to automatically close it in 30 days. If you're still seeing this issue with the latest version of Nomad, please respond here and we'll keep this open and take another look at this.
Thanks!
# Comment to post when removing the stale label. Set to `false` to disable
unmarkComment: false

# Comment to post when closing a stale Issue or Pull Request. Set to `false` to disable
closeComment: >
This issue will be auto-closed because there hasn't been any activity for a few months.
Feel free to [open a new one](https://github.com/hashicorp/nomad/issues/new) if you still experience this problem :+1:
# Limit to only `issues`
only: issues
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
/*.hcl
.DS_Store
Thumbs.db
.idea

# Folders
_obj
Expand Down Expand Up @@ -86,11 +87,16 @@ rkt-*
/ui/testem.log
.ignore

# ember-try
/ui/.node_modules.ember-try/
/ui/bower.json.ember-try
/ui/package.json.ember-try

# generated routes file
command/agent/bindata_assetfs.go

# auto-generated cert file for Terraform/Azure
azure-hashistack.pem

# generated keys for e2e tests
e2e/terraform/keys/
e2e/terraform/keys/
29 changes: 26 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,27 @@ matrix:
- os: linux
dist: xenial
sudo: required
env: GOTEST_PKGS="./api"
- os: linux
dist: xenial
sudo: required
env: GOTEST_PKGS="./client"
- os: linux
dist: xenial
sudo: required
env: GOTEST_PKGS="./drivers/docker"
- os: linux
dist: xenial
sudo: required
env: GOTEST_PKGS="./drivers/exec"
- os: linux
dist: xenial
sudo: required
env: GOTEST_PKGS="./nomad"
- os: linux
dist: xenial
sudo: required
env: GOTEST_PKGS_EXCLUDE="./api|./client|./drivers/docker|./drivers/exec|./nomad"
- os: linux
dist: xenial
sudo: required
Expand Down Expand Up @@ -49,13 +70,15 @@ matrix:
before_install:
- if [[ "$TRAVIS_OS_NAME" == "osx" ]] && [[ -z "$SKIP_NOMAD_TESTS" ]]; then sudo -E bash ./scripts/travis-mac-priv.sh ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ -z "$SKIP_NOMAD_TESTS" ]]; then sudo -E bash ./scripts/travis-linux.sh ; fi
- if [[ "$RUN_UI_TESTS" ]]; then curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.0.1 ; fi
- if [[ "$TRAVIS_OS_NAME" == "linux" ]] && [[ "$RUN_STATIC_CHECKS" ]]; then sudo -E bash ./scripts/vagrant-linux-priv-protoc.sh; fi
- if [[ "$RUN_UI_TESTS" ]]; then curl -o- -L https://yarnpkg.com/install.sh | bash -s -- --version 1.15.2 ; fi
- if [[ "$RUN_UI_TESTS" ]]; then export PATH="$HOME/.yarn/bin:$PATH" ; fi
- echo "Travis Node Version" && node -v

install:
- if [[ -z "$SKIP_NOMAD_TESTS" ]]; then make deps ; fi
- if [[ -z "$SKIP_NOMAD_TESTS" ]] || [[ "$RUN_STATIC_CHECKS" ]]; then make deps; fi
- if [[ "$RUN_STATIC_CHECKS" ]]; then make lint-deps ; fi
- if [[ "$RUN_UI_TESTS" ]]; then . $HOME/.nvm/nvm.sh && cd ui && nvm use && cd .. ; fi
- if [[ "$RUN_UI_TESTS" ]]; then . $HOME/.nvm/nvm.sh && cd ui && nvm install && nvm use && cd .. ; fi

script:
- sudo -E "PATH=$PATH" GOTESTSUM_JUNITFILE=/tmp/results.xml make travis
Expand Down
Loading

0 comments on commit e30cc90

Please sign in to comment.