Skip to content

Commit

Permalink
♻️ REFACTOR: ci/ folder (#4565)
Browse files Browse the repository at this point in the history
This commit looks to address two issues:

1. The `ci/` folder has become cluttered; 
   it contains configuration and scripts for both the GitHub Actions and Jenkins CI
   and it is not easily clear which is for which.
2. The Jenkins tests are somewhat of a black-box to most,
   since it is certainly not trivial to set up and run them locally.
   This has lead to them essentially not being touched since they were first written.

The changes are as follows:

1. Moved the GH actions specific scripts to `.github/system_tests`
2. Refactored the Jenkins setup/tests to use [molecule](https://molecule.readthedocs.io) in the `.molecule/` folder 
   (note we use molecule for testing all the quantum mobile code).
   You can read about this setup in `.molecule/README.md`,
   but essentially if you just run `tox -e molecule-django` locally it will create/launch a docker container, 
  setup and run the tests within that container, then destroy the container.
  Locally, it additionally records and prints an analysis of queries made to the database during the workchain runs.
3. Moved the Jenkins configuration to `.jenkins/`, which is now mainly a thin wrapper around (2).

This makes these tests more portable and easier to understand, modify or add to.
  • Loading branch information
chrisjsewell authored Feb 9, 2021
1 parent e6ba465 commit 99f988b
Show file tree
Hide file tree
Showing 46 changed files with 829 additions and 420 deletions.
108 changes: 0 additions & 108 deletions .ci/Dockerfile

This file was deleted.

179 changes: 0 additions & 179 deletions .ci/Jenkinsfile

This file was deleted.

9 changes: 0 additions & 9 deletions .ci/polish/polish_workchains/__init__.py

This file was deleted.

34 changes: 0 additions & 34 deletions .ci/setup.sh

This file was deleted.

32 changes: 0 additions & 32 deletions .ci/test_rpn.sh

This file was deleted.

2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
source = aiida

[html]
directory = .ci/coverage/html
directory = .coverage_html
9 changes: 7 additions & 2 deletions .ci/docker-rabbitmq.yml → .docker/docker-rabbitmq.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
# if you wish to control the rabbitmq used.

# Simply install docker, then run:
# $ docker-compose -f .ci/docker-rabbitmq.yml up -d
# $ docker-compose -f .docker/docker-rabbitmq.yml up -d

# and to power down, after testing:
# $ docker-compose -f .ci/docker-rabbitmq.yml down
# $ docker-compose -f .docker/docker-rabbitmq.yml down

# you can monitor rabbitmq use at: http://localhost:15672

Expand All @@ -27,3 +27,8 @@ services:
interval: 30s
timeout: 30s
retries: 5
networks:
- aiida-rmq

networks:
aiida-rmq:
Loading

0 comments on commit 99f988b

Please sign in to comment.