Merge pull request #10841 from cBioPortal/remove-ref

Remove demo-rfc72 reference from integration test

.github/workflows/integration-test.yml

@@ -36,7 +36,6 @@ jobs:
         uses: actions/checkout@master
         with:
           repository: cbioportal/cbioportal-docker-compose
-          ref: demo-rfc72
           path: ./cbioportal-docker-compose
       - name: 'Initialize cbioportal-docker-compose'
         working-directory: ./cbioportal-docker-compose

test/integration/docker-compose-localbuild.yml

@@ -5,7 +5,7 @@ version: '3'
 
 services:
   cbioportal:
-    command: /bin/sh -c "java -Xms2g -Xmx4g -jar cbioportal/target/cbioportal-exec.jar --spring.config.location=cbioportal/application.properties --authenticate=false"
+    command: /bin/sh -c "java -Xms2g -Xmx4g -jar cbioportal/target/cbioportal-exec.jar --spring.config.location=cbioportal-webapp/application.properties --authenticate=false"
     volumes:
      #- $PORTAL_INFO_DIR:/portalinfo/
      # make docker compose run the cbioportal version-under-test

test/integration/test_update_oncokb.sh

@@ -15,7 +15,7 @@ echo "Testing update of OncoKB annotations..."
 run_in_service cbioportal 'metaImport.py -v -u http://cbioportal-container:8080 -o -s /cbioportal/test/test_data/study_oncokb_update/'
 
 # execute updateOncokb script
-run_in_service cbioportal 'python3 /core/scripts/importer/updateOncokbAnnotations.py -s study_es_0 -p /cbioportal/application.properties'
+run_in_service cbioportal 'python3 /core/scripts/importer/updateOncokbAnnotations.py -s study_es_0 -p /cbioportal-webapp/application.properties'
 
 # Check that mutation annotations have been updated
 # 2 annotations should be changed to "Putative_Driver" (depends on OncoKB version)