Skip to content

Commit

Permalink
🔥 removed api token validation
Browse files Browse the repository at this point in the history
  • Loading branch information
bart-maykin committed May 3, 2024
1 parent 7f60637 commit ea9eeb4
Show file tree
Hide file tree
Showing 35 changed files with 133 additions and 748 deletions.
177 changes: 0 additions & 177 deletions Jenkinsfile

This file was deleted.

4 changes: 2 additions & 2 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ References
* `Code <https://bitbucket.org/maykinmedia/referentielijsten>`_


.. |build-status| image:: http://jenkins.maykin.nl/buildStatus/icon?job=bitbucket/referentielijsten/master
.. |build-status| image:: https://github.com/maykinmedia/referentielijsten/workflows/ci/badge.svg?branch=master
:alt: Build status
:target: http://jenkins.maykin.nl/job/referentielijsten
:target: https://github.com/maykinmedia/referentielijsten/actions?query=workflow%3Aci

.. |requirements| image:: https://requires.io/bitbucket/maykinmedia/referentielijsten/requirements.svg?branch=master
:target: https://requires.io/bitbucket/maykinmedia/referentielijsten/requirements/?branch=master
Expand Down
4 changes: 2 additions & 2 deletions bootstrap.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
parser = argparse.ArgumentParser(description=description)
parser.add_argument(
"target",
choices=["production", "staging", "test", "jenkins", "dev"],
help="production/staging/test/jenkins/dev",
choices=["production", "staging", "test", "ci", "dev"],
help="production/staging/test/ci/dev",
)
parser.add_argument(
"--project",
Expand Down
32 changes: 0 additions & 32 deletions ci/Dockerfile

This file was deleted.

36 changes: 0 additions & 36 deletions ci/jenkins.sh

This file was deleted.

Empty file removed ci/myproject/.gitkeep
Empty file.
52 changes: 0 additions & 52 deletions ci/run_ci.sh

This file was deleted.

52 changes: 0 additions & 52 deletions docs/testing.rst
Original file line number Diff line number Diff line change
Expand Up @@ -28,24 +28,6 @@ and::
$ alias cov_runtests='coverage run src/manage.py test --keepdb'
$ cov_runtests src && chromium htmlcov/index.html


Jenkins
-------

Run ``./bin/jenkins_django.sh`` to execute the tests for ``develop`` and ``master``.
This script runs the tests with ``--keepdb``.

To run PR tests, run ``./bin/jenkins_django_pr.sh``. This script drops the test
database at the end, so it should be safe with different migrations between PR's.


SASS build - Jenkins
====================

There is a simple ``./bin/jenkins_sass.sh`` script that checks if the sass
compiles successfully.


Javascript tests
================

Expand All @@ -69,37 +51,3 @@ To trigger a test run on file change (source file or test file), run::

$ karma start karma.conf.js --single-run=false --browsers=PhantomJS


Jenkins
-------

On Jenkins, the tests are run against PhantomJS and Chrome. Therefore, ``xfvb``
needs to be available.

Run the tests by invoking ``./bin/jenkins_js.sh``.


Jenkins jobs
============

It is recommended to set up the following Jenkins jobs for a project:

**master** branch
-----------------

1. ``referentielijsten-django``: backend tests, runs ``./bin/jenkins_django.sh``.
2. ``referentielijsten-js``: frontend tests, runs ``./bin/jenkins_js.sh``.

**develop** branch
------------------

1. ``referentielijsten-django-develop``: backend tests, runs ``./bin/jenkins_django.sh``.
2. ``referentielijsten-django-develop-js``: frontend tests, runs ``./bin/jenkins_js.sh``.

pull requests
-------------
1. ``referentielijsten-pr-django``: backend tests, runs ``./bin/jenkins_django_pr.sh``.
2. ``referentielijsten-pr-js``: frontend tests, runs ``./bin/jenkins_js.sh``.
3. ``referentielijsten-pr-sass``: checks that sass compiles, runs ``./bin/jenkins_sass.sh``.
4. ``referentielijsten-pr-isort``: checks that imports are correctly
sorted, runs ``./bin/jenkins_isort.sh``.
2 changes: 1 addition & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ ensure_newline_before_comments = True
skip = env,node_modules
skip_glob = **/migrations/**
known_django=django
known_first_party=openklant
known_first_party=referentielijsten
sections=FUTURE,STDLIB,DJANGO,THIRDPARTY,FIRSTPARTY,LOCALFOLDER

; black compatible settings
Expand Down
Loading

0 comments on commit ea9eeb4

Please sign in to comment.