Skip to content

Commit

Permalink
contributing : making changes
Browse files Browse the repository at this point in the history
Signed-off-by: Nicolas PLANEL <nplanel@redhat.com>
  • Loading branch information
nplanel committed Jul 26, 2017
1 parent 4e94f78 commit 189785a
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 5 deletions.
21 changes: 21 additions & 0 deletions CONTRIBUTING.md
Expand Up @@ -4,6 +4,27 @@ Contributing to Skydive
Your contributions are more than welcome. Please read the following notes to
know about the process.

Making Changes:
---------------

Before pushing your changes, please make sure the tests and the linters pass:

* make fmt
* make test
* make functional

_Please note, make functional will create local network resources
(bridges, namespaces, ...)_

Once ready push your changes to your Skydive fork our CI will check your
pull request.

We're much more likely to approve your changes if you:

* Add tests for new functionality.
* Write a good commit message, please see how to write below.
* Maintain backward compatibility.

How To Submit Code
------------------

Expand Down
13 changes: 8 additions & 5 deletions Makefile
Expand Up @@ -68,20 +68,23 @@ else
endif

test.functionals.all: test.functionals.compile
make TIMEOUT="8m" ARGS=${ARGS} test.functionals.run
$(MAKE) TIMEOUT="8m" ARGS=${ARGS} test.functionals.run

test.functionals.batch: test.functionals.compile
ifneq ($(TEST_PATTERN),)
set -e ; make ARGS="${ARGS} -test.run ${TEST_PATTERN}" test.functionals.run
set -e ; $(MAKE) ARGS="${ARGS} -test.run ${TEST_PATTERN}" test.functionals.run
else
set -e ; make ARGS="${ARGS}" test.functionals.run
set -e ; $(MAKE) ARGS="${ARGS}" test.functionals.run
endif

test.functionals: test.functionals.compile
for functest in ${FUNC_TESTS} ; do \
make ARGS="-test.run $$functest$$\$$ ${ARGS} ${COVERAGE_ARGS}" test.functionals.run; \
$(MAKE) ARGS="-test.run $$functest$$\$$ ${ARGS} ${COVERAGE_ARGS}" test.functionals.run; \
done

functional:
$(MAKE) test.functionals VERBOSE=true TIMEOUT=10m ARGS='-standalone'

test: govendor genlocalfiles
ifeq ($(COVERAGE), true)
set -v ; \
Expand Down Expand Up @@ -170,7 +173,7 @@ dist:
export GOPATH=$$godir; \
cd $$skydivedir; \
echo "go take a coffee, govendor sync takes time ..."; \
make govendor genlocalfiles; \
$(MAKE) govendor genlocalfiles; \
popd; \
tar -C $$tmpdir --exclude=skydive-${VERSION}/src/github.com/skydive-project/skydive/.git -cvzf ${DESTDIR}/skydive-${VERSION}.tar.gz skydive-${VERSION}/src; \
rm -rf $$tmpdir

0 comments on commit 189785a

Please sign in to comment.