Commit 89fc3487 authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

ci: migrate only to rules

parent 32918507

.gitlab-ci.yml

+8 −10
Original line number Diff line number Diff line
@@ -44,7 +44,7 @@ test-on-remote: 
    VAULT_TOKEN: "$TEST_VAULT_TOKEN"

    VAULT_SECRET_ID: "$TEST_VAULT_SECRET_ID"

    VAULT_AUTH_METHOD: "auto"

  stage: acceptance

  stage: package-test

  script:

    - curl -s -S -f "http://vault-secrets-provider/health"

    - |
@@ -55,11 +55,10 @@ test-on-remote: 
        echo "no secret to test - skip"

      fi

    # TODO: test a client error

  only:

    refs:

      - branches

    variables:

      - "$TEST_VAULT_BASE_URL"

  rules:

    - if: '$TEST_VAULT_BASE_URL == null || $TEST_VAULT_BASE_URL == ""'

      when: never

    - !reference [.test-policy, rules]



# this job tests the Docker image on a local Vault server using the Vault server image

# See: https://hub.docker.com/_/vault
@@ -80,7 +79,7 @@ test-on-local: 
    VAULT_TOKEN: "dev-root-token"

    # This allows the main container to connect to the services containers

    FF_NETWORK_PER_BUILD: "1"

  stage: acceptance

  stage: package-test

  script:

    # wait for a while that all services are UP and running

    - sleep 5
@@ -155,6 +154,5 @@ test-on-local: 
    #     cat resp.txt

    #     exit 1

    #   fi

  only:

    refs:

      - branches
 
  rules:

    - !reference [.test-policy, rules]