Commit c476548c authored by Ari Trachtenberg's avatar Ari Trachtenberg
Browse files

Merge branch 'addingInternalTestsLab3' into 'master' 

uncommented internal tests for lab3

See merge request !8
parents e0b167bd f7470f3d

ci_cd/lab3.yml

+11 −11
Original line number Diff line number Diff line
@@ -85,14 +85,14 @@ test_lab_3: 
    - if: '$CI_COMMIT_REF_NAME == "lab3"'

  tags: [c++-17]



## trigger internal tests only upon a merge request into master

#internal_tests_lab_3:

#  stage: tests

#  script:

#    - git clone https://trachten-gitlab:$INTERNAL_LAB_TESTS@agile.bu.edu/gitlab/ec337/ec337-staff/lab-tests.git

#    - cp -f lab3.cpp lab-tests/internal_tests/

#    - cd lab-tests/internal_tests

#    - make lab3

#  rules:

#    - if: '$CI_COMMIT_REF_NAME == "lab3" && $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'

#  tags: [ c++-17 ]
 
# trigger internal tests only upon a merge request into master

internal_tests_lab_3:

 stage: tests

 script:

   - git clone https://trachten-gitlab:$INTERNAL_LAB_TESTS@agile.bu.edu/gitlab/ec337/ec337-staff/lab-tests.git

   - cp -f lab3.cpp lab-tests/internal_tests/

   - cd lab-tests/internal_tests

   - make lab3

 rules:

   - if: '$CI_COMMIT_REF_NAME == "lab3" && $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == "master"'

 tags: [ c++-17 ]