feat(ci): uses rsksmart docker images

rsksmart · May 13, 2024 · 28577a8 · 28577a8
1 parent a00ca3c
commit 28577a8
Showing 1 changed file with 23 additions and 13 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -60,8 +60,8 @@ jobs:
     container:
       image: eclipse-temurin:17-jdk
     defaults:
-        run:
-            working-directory: .
+      run:
+        working-directory: .
     steps:
       - uses: actions/checkout@v2
       - name: Run SonarQube analysis
@@ -93,7 +93,11 @@ jobs:
           echo "Running SonarQube analysis"
           ./configure.sh
           ./gradlew sonarqube --no-daemon -x build -x test $extra_flags \
-          -Dsonar.organization=rsksmart -Dsonar.host.url="$sonar_url" -Dsonar.login="$sonar_token"
+          -Dsonar.organization=rsksmart -Dsonar.host.url="$sonar_url" -Dsonar.login="$sonar_token" \
+          -Dsonar.scm.provider=git
+
+
+
 
   tests:
     needs: build
@@ -164,10 +168,10 @@ jobs:
 
       - name: Build and push Docker images
         run: |
-          docker build -t jurajpiar/bitcoind1:latest -f bitcoind1.Dockerfile .
-          docker push jurajpiar/bitcoind1:latest
-          docker build -t jurajpiar/bitcoind2:latest -f bitcoind2.Dockerfile .
-            docker push jurajpiar/bitcoind2:latest
+          docker build -t rsksmart/mit_bitcoind1:latest -f bitcoind1.Dockerfile .
+          docker push rsksmart/mit_bitcoind1:latest
+          docker build -t rsksmart/mit_bitcoind2:latest -f bitcoind2.Dockerfile .
+            docker push rsksmart/mit_bitcoind2:latest
 
 
   mining-tests:
@@ -177,14 +181,14 @@ jobs:
     runs-on: ubuntu-latest
     services:
         bitcoind1:
-            image: jurajpiar/bitcoind1:latest
+            image: rsksmart/mit_bitcoind1:latest
             ports:
             - 8331:8331
             - 31591:31591
             - 32591:32591
             options: --name bitcoind1
         bitcoind2:
-            image: jurajpiar/bitcoind2:latest
+            image: rsksmart/mit_bitcoind2:latest
             ports:
             - 8332:8332
             - 31592:31592
@@ -214,6 +218,11 @@ jobs:
         run: |
           npm ci
 
+      - name: Change mining-integration-tests bitcoind url in config.json to localhost
+        working-directory: mining-integration-tests
+        run: |
+          sed -i 's/bitcoind01/localhost/g' config.json
+
       - name: Generate BTC blocks
         working-directory: mining-integration-tests
         run: |
@@ -241,10 +250,11 @@ jobs:
 
       - name: Build
         run: |
-          ls -al rskj-core/build
-          ls -al ./gradle/wrapper/gradle-wrapper.jar
-          ./configure.sh
-
+          if [ ! -d rskj-core/build ]; then # FIXME: remove this condition after the cache is fixed
+            ./configure.sh
+            ./gradlew --no-daemon dependencies
+            ./gradlew --no-daemon --stacktrace build -x test
+          fi
       - name: Start RSKj and Run Tests
         working-directory: mining-integration-tests
         run: |