Refactor to pull boptest_base image in GitHub Actions.

ibpsa · Sep 20, 2024 · 3a475db · 3a475db
1 parent 7218f83
commit 3a475db
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 19 deletions.
diff --git a/.github/workflows/github-actions.yml b/.github/workflows/github-actions.yml
@@ -16,13 +16,10 @@ jobs:
         uses: actions/checkout@v3
       - name: Pull boptestgym image from registry
         run: make pull-boptestgym
-      - run: echo "The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
-      - name: List of files in the repository
-        run: | 
-         ls ${{ github.workspace }}
-      - name: Set up Docker
-        uses: docker/setup-buildx-action@v2
+      - name: Pull boptest_base image from registry
+        run: make pull-boptestbase
       - name: Install Docker Compose
+        uses: docker/setup-buildx-action@v2
         run: |
           sudo apt-get update
           sudo apt-get install -y docker-compose
@@ -38,13 +35,10 @@ jobs:
         uses: actions/checkout@v3
       - name: Pull boptestgym image from registry
         run: make pull-boptestgym
-      - run: echo "The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
-      - name: List of files in the repository
-        run: | 
-         ls ${{ github.workspace }}
-      - name: Set up Docker
-        uses: docker/setup-buildx-action@v2
+      - name: Pull boptest_base image from registry
+        run: make pull-boptestbase
       - name: Install Docker Compose
+        uses: docker/setup-buildx-action@v2
         run: |
           sudo apt-get update
           sudo apt-get install -y docker-compose
@@ -60,10 +54,8 @@ jobs:
         uses: actions/checkout@v3
       - name: Pull boptestgym image from registry
         run: make pull-boptestgym
-      - run: echo "The name of your branch is ${{ github.ref }} and your repository is ${{ github.repository }}."
-      - name: List of files in the repository
-        run: | 
-         ls ${{ github.workspace }}
+      - name: Pull boptest_base image from registry
+        run: make pull-boptestbase
       - name: Test service version
         run: make test-service-in-container
 
diff --git a/testing/Makefile b/testing/Makefile
@@ -87,19 +87,16 @@ download-boptest:
 	unzip -o -q boptest.zip
 
 run-boptest-case:
-	make pull-boptestbase
 	make download-boptest
 	cd project1-boptest-${BOPTEST_COMMIT} && \
 	TESTCASE=bestest_hydronic_heat_pump docker compose up -d
 
 run-boptest-case-no-cache:
-	make pull-boptestbase
 	make download-boptest
 	cd project1-boptest-${BOPTEST_COMMIT} && \
 	TESTCASE=bestest_hydronic_heat_pump docker compose up -d --force-recreate --build
 
 run-boptest-vectorized:
-	make pull-boptestbase
 	make download-boptest && \
 	cd .. && python3 generateDockerComposeYml.py testing/project1-boptest-${BOPTEST_COMMIT} && \
 	cd testing/project1-boptest-${BOPTEST_COMMIT} && \