Commit ff3f0c06 authored by juga's avatar juga
Browse files

Merge pull request 'gitlab-ci2' (#7) from juga/pEpPythonMixnet:gitlab-ci2 into master

parents 830fd761 b08e417a

.gitlab-ci.yml

+12 −6
Original line number Diff line number Diff line 
variables:

  DEBIAN_FRONTEND: noninteractive

  # There is not $CI_REGISTRY_IMAGE in https://pep-security.lu/gitlab/

  CI_REGISTRY_IMAGE: juga/peppythonmixnet

  # The name of the image would be user/repo:commit-sha

  # Not using $CI_COMMIT_REF_SLUG because that adds the name of the branch

  # and when pushing from a branch and pulling from other the name wouldn't
@@ -13,16 +11,20 @@ variables: 
# The following are jobs to create the dockerimage from docker with the

# gitlab runner.

build_docker:

  tags: [kvm]

  stage: build

  image: docker:stable

  services:

      - docker:stable-dind

  before_script:

    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY

  script:

    - echo building $IMAGE and releasing as $RELEASE_IMAGE

    - docker info

    - docker build -t $IMAGE .

    # - docker push $IMAGE

    - docker push $IMAGE

    # tag it as latest and push it too

    - docker tag $IMAGE $RELEASE_IMAGE

    # - docker push $RELEASE_IMAGE

    - docker push $RELEASE_IMAGE

  except:

    - master
@@ -37,7 +39,11 @@ test_remailer: 




test_mixnet:

  tags: [kvm]

  image: docker

  services:

      - docker:dind

  before_script:

    - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY

  script:

    - apk add --no-cache py-pip gcc libffi-dev openssl-dev libc-dev make python3-dev

    - pip install docker-compose

docs/source/integration.rst

+2 −6
Original line number Diff line number Diff line 
Integration tests

=================



To run the integration test, you will need docker installed and these domains

in ``/etc/hosts``::

To run the integration test, you will need docker installed.



  127.0.0.1    n1.pep.example n2.pep.example n3.pep.example openpgp.example

  ::1          n1.pep.example n2.pep.example n3.pep.example openpgp.example



And run ``docker/run_test.sh``.

Then run ``docker-compose up -d``



The test represent the following scenario: