Commit 866b1154 authored by McDonnell, Marshall's avatar McDonnell, Marshall
Browse files

Fixes ci steps

parent 0d9c31f4

.dockerignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
Dockerfile

.gitlab-ci.yml

+3 −17
Original line number Diff line number Diff line
@@ -19,16 +19,11 @@ after_script: 
  - func_rse_docker_cleanup

  - sudo chown -R gitlab-runner .



.test_docker_job:

test:

  stage: test

  variables:

    PROJECT: project

    NAME: name

    TEST_COMMAND: test # must be a single value string ("pytest"), not multi-values in single string ("pytest --cov=.")

  script:

    - cd ${PROJECT}/${NAME}

    - docker build -f Dockerfile -t image .

    - docker run --entrypoint=${TEST_COMMAND} image

    - docker run image pixi run pytest tests/

  tags:

    - rse-multi-builder
@@ -41,7 +36,6 @@ after_script: 
    FORCE_TAGS: "false"

  when: manual

  script:

    - cd ${PROJECT}/${NAME}

    - docker build -f Dockerfile --target devel -t image_devel . || true

    - docker build -f Dockerfile -t image .

    - IMAGE_NAME=${CONTAINER_IMAGE_URL}/${PROJECT}/${NAME}
@@ -57,17 +51,9 @@ after_script: 
    - rse-multi-builder





test-asrp-gsas2-refinement:

  extends: .test_docker_job

  variables:

    PROJECT: asrp

    NAME: gsas2_refinement

    TEST_COMMAND: pytest





build-asrp-gsas2-refinement:

  extends: .build_docker_job

  needs: [test-asrp-gsas2-refinement]

  needs: [test]

  variables:

    PROJECT: asrp

    NAME: gsas2_refinement