Update pytest.yml

RTXteam · Feb 25, 2025 · bf33240 · bf33240
1 parent fe84cfb
commit bf33240
Showing 1 changed file with 8 additions and 16 deletions.
diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -6,6 +6,7 @@ on:
   push:
     branches: [ master, production, itrb-test, dev ]
     paths:
+      - '/.github/**'
       - 'code/**'
       - 'DockerBuild/**'
       - 'requirements.txt'
@@ -40,15 +41,14 @@ jobs:
     - name: Set up config files
       run: |
         scp araxconfig@araxconfig.rtx.ai:config_secrets.json /mnt/config/config_secrets.json
-        echo "http://localhost:5008/api/rtxkg2/v1.4" > /mnt/config/kg2_url_override.txt
 
 
     - name: Download databases into CICD instance
-      continue-on-error: true
+      # continue-on-error: true
       run: |
         cd /home/ubuntu/RTX
         git checkout ${GITHUB_REF#refs/heads/}
-        git pull origin ${GITHUB_REF#refs/heads/}
+        git pull
         /home/ubuntu/venv3.9/bin/pip3 install -r requirements.txt
         /home/ubuntu/venv3.9/bin/python3 code/ARAX/ARAXQuery/ARAX_database_manager.py --mnt --skip-if-exists --remove_unused
         git checkout master
@@ -61,35 +61,27 @@ jobs:
 
     - name: Clean up any left over containers
       continue-on-error: true
-      run: sudo docker rm $(sudo docker ps -aq)
+      run: docker container prune -f
 
     - name: Clean up any left over images
       continue-on-error: true
-      run: sudo docker rmi $(sudo docker images -q)
+      run: docker image prune -f
 
     - name: Build docker image 
-      run: sudo docker build --no-cache=true --rm -t rtx:test DockerBuild/ -f DockerBuild/Merged-Dockerfile
+      run: sudo docker build --no-cache=true --rm -t rtx:test DockerBuild/ -f DockerBuild/CICD-Dockerfile
 
     - name: Run docker container
-      run: sudo docker run -d -it --name rtx_test -v /mnt/data/orangeboard/databases:/mnt/data/orangeboard/databases -v /mnt/config/kg2_url_override.txt:/mnt/data/orangeboard/production/RTX/code/kg2_url_override.txt -v /mnt/config/config_secrets.json:/mnt/data/orangeboard/production/RTX/code/config_secrets.json -v /mnt/config/config_secrets.json:/mnt/data/orangeboard/kg2/RTX/code/config_secrets.json rtx:test
-
-#     - name: Add config.domain
-#       run: |
-#         sudo docker exec rtx_test bash -c "sudo -u rt bash -c 'cd /mnt/data/orangeboard/production/RTX/code && echo \'RTXTeam/RTX Github actions test suite\' > config.domain'"
-#         sudo docker exec rtx_test bash -c "sudo -u rt bash -c 'cd /mnt/data/orangeboard/kg2/RTX/code && echo \'RTXTeam/RTX Github actions test suite\' > config.domain'"
+      run: sudo docker run -d -it --name rtx_test -v /mnt/data/orangeboard/databases:/mnt/data/orangeboard/databases -v /mnt/config/config_secrets.json:/mnt/data/orangeboard/production/RTX/code/config_secrets.json rtx:test
 
     - name: Create symlinks
-      run: |
-        sudo docker exec rtx_test bash -c "sudo -u rt bash -c 'cd /mnt/data/orangeboard/production/RTX && python3 code/ARAX/ARAXQuery/ARAX_database_manager.py'"
-        sudo docker exec rtx_test bash -c "sudo -u rt bash -c 'cd /mnt/data/orangeboard/kg2/RTX && python3 code/ARAX/ARAXQuery/ARAX_database_manager.py'"
+      run: sudo docker exec rtx_test bash -c "sudo -u rt bash -c 'cd /mnt/data/orangeboard/production/RTX && python3 code/ARAX/ARAXQuery/ARAX_database_manager.py'"
 
     - name: Build KP info cache
       run: sudo docker exec rtx_test bash -c "cd /mnt/data/orangeboard/production/RTX/code/ARAX/ARAXQuery/Expand && python3 kp_info_cacher.py"
 
     - name: Start services
       run: |
         sudo docker exec rtx_test service apache2 start
-        sudo docker exec rtx_test service RTX_OpenAPI_kg2 start
         sudo docker exec rtx_test service RTX_OpenAPI_production start
         sudo docker exec rtx_test service RTX_Complete start