FIX cleanup

.github/workflows/functional.yml

@@ -27,18 +27,9 @@ jobs:
         ports:
           - 27017:27017
 
-      #mosquitto:
-      #  # Needed by MQTT notification tests
-      #  image: eclipse-mosquitto:1.6.15
-      #  ports:
-      #  - 1883:1883
-      #  volumes:
-      #    - ${{ github.workspace}}/test/functionalTest/mosquitto_conf_for_tests.conf:/mosquitto/config/mosquitto.conf
-      #    - ${{ github.workspace}}/test/functionalTest/mosquitto_passwd:/mosquitto/config/passwd
-
       mosquitto-extra:
         # Needed by MQTT notification tests (multi broker)
-        image: eclipse-mosquitto:1.6.15
+        image: eclipse-mosquitto:2.0.11
         ports:
         - 1884:1883
 
@@ -48,30 +39,25 @@ jobs:
       matrix:
         payload:
           - { name: 'batch debug - cache', range: '-e FT_FROM_IX=662 -e FT_TO_IX=669' }
-          #- { name: 'batch 1 - cache', range: '-e FT_FROM_IX=0 -e FT_TO_IX=300' }
-          #- { name: 'batch 2 - cache', range: '-e FT_FROM_IX=301 -e FT_TO_IX=600' }
-          #- { name: 'batch 3 - cache', range: '-e FT_FROM_IX=601 -e FT_TO_IX=900' }
-          #- { name: 'batch 4 - cache', range: '-e FT_FROM_IX=901 -e FT_TO_IX=1200' }
-          #- { name: 'batch 5 - cache', range: '-e FT_FROM_IX=1201' }
-          #- { name: 'batch 1 - no cache', range: '-e CB_NO_CACHE=ON -e FT_FROM_IX=0 -e FT_TO_IX=300' }
-          #- { name: 'batch 2 - no cache', range: '-e CB_NO_CACHE=ON -e FT_FROM_IX=301 -e FT_TO_IX=600' }
-          #- { name: 'batch 3 - no cache', range: '-e CB_NO_CACHE=ON -e FT_FROM_IX=601 -e FT_TO_IX=900' }
-          #- { name: 'batch 4 - no cache', range: '-e CB_NO_CACHE=ON -e FT_FROM_IX=901 -e FT_TO_IX=1200' }
-          #- { name: 'batch 5 - no cache', range: '-e CB_NO_CACHE=ON -e FT_FROM_IX=1201' }
+          - { name: 'batch 1 - cache', range: '-e FT_FROM_IX=0 -e FT_TO_IX=300' }
+          - { name: 'batch 2 - cache', range: '-e FT_FROM_IX=301 -e FT_TO_IX=600' }
+          - { name: 'batch 3 - cache', range: '-e FT_FROM_IX=601 -e FT_TO_IX=900' }
+          - { name: 'batch 4 - cache', range: '-e FT_FROM_IX=901 -e FT_TO_IX=1200' }
+          - { name: 'batch 5 - cache', range: '-e FT_FROM_IX=1201' }
+          - { name: 'batch 1 - no cache', range: '-e CB_NO_CACHE=ON -e FT_FROM_IX=0 -e FT_TO_IX=300' }
+          - { name: 'batch 2 - no cache', range: '-e CB_NO_CACHE=ON -e FT_FROM_IX=301 -e FT_TO_IX=600' }
+          - { name: 'batch 3 - no cache', range: '-e CB_NO_CACHE=ON -e FT_FROM_IX=601 -e FT_TO_IX=900' }
+          - { name: 'batch 4 - no cache', range: '-e CB_NO_CACHE=ON -e FT_FROM_IX=901 -e FT_TO_IX=1200' }
+          - { name: 'batch 5 - no cache', range: '-e CB_NO_CACHE=ON -e FT_FROM_IX=1201' }
 
     steps:
       - uses: actions/checkout@v2
 
       - name: Run Mosquitto container with authenticated user
         # Why don't to use a service for this (as moquitto-extra above)? It would be the desirable solution, but I haven't able to
         # configure volumes properly for it (the mosquitto container as service has problems to get the configuration files). Feedback welcome! :)
-        #run: docker run -d --name mosquitto -p 1883:1883 -v $(pwd)/test/functionalTest/mosquittoConf:/mosquitto/config eclipse-mosquitto:1.6.15
         run: docker run -d --name mosquitto -p 1883:1883 -v $(pwd)/test/functionalTest/mosquittoConf:/mosquitto/config eclipse-mosquitto:2.0.11
 
-      - name: Log before running test
-        run: |
-              docker logs mosquitto
-
       - name: Run functional test
         run: |
           docker run  --network host -t --rm -e REPO_ACCESS_TOKEN=${{ secrets.REPO_ACCESS_TOKEN }} ${{ matrix.payload.range }} -v $(pwd):/opt/fiware-orion ${{ env.TEST_IMAGE_NAME }} build -miqts functional

test/functionalTest/mosquittoConf/mosquitto.conf

@@ -1,4 +1,3 @@
-#password_file /etc/mosquitto/passwd
 password_file /mosquitto/config/mosquitto_passwd
 allow_anonymous true
 listener 1883 0.0.0.0