diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index ccf832d0f4..74785c10c5 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -11,13 +11,13 @@ # name: "CodeQL Advanced" -# on: -# push: -# branches: [ "master" ] -# pull_request: -# branches: [ "master" ] -# schedule: -# - cron: '33 5 * * 1' + on: + push: + branches: [ "master" ] + pull_request: + branches: [ "master" ] + schedule: + - cron: '33 5 * * 1' jobs: analyze: diff --git a/.github/workflows/compliance.yml b/.github/workflows/compliance.yml index f5f2cfcd99..42189f4e89 100644 --- a/.github/workflows/compliance.yml +++ b/.github/workflows/compliance.yml @@ -1,13 +1,13 @@ name: Compliance Tests -#on: -# push: -# branches: -# - master -# pull_request: -# branches: -# - master -# - '!checkvalgrind**' +on: + push: + branches: + - master + pull_request: + branches: + - master + - '!checkvalgrind**' jobs: compliance: diff --git a/.github/workflows/example.yml b/.github/workflows/example.yml deleted file mode 100644 index c6617e319a..0000000000 --- a/.github/workflows/example.yml +++ /dev/null @@ -1,37 +0,0 @@ -name: Mosquitto Docker Action (example 1) - -#on: [push] - -jobs: - publish-messages: - runs-on: ubuntu-latest - - services: - mosquitto: - image: eclipse-mosquitto:latest - ports: - - 1883:1883 - volumes: - - ${{ github.workspace}}/test/functionalTest/mosquittoConf:/mosquitto/config - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Install mosquitto clients - run: sudo apt-get update && sudo apt-get install -y mosquitto-clients - - - name: Publish anonymously - run: mosquitto_pub -h localhost -p 1883 -t "test/topic" -m "Hello from anonymous" - - - name: Publish with user1 - run: mosquitto_pub -h localhost -p 1883 -u user1 -P xxxx -t "test/topic" -m "Hello from user1" - - -# Create a mosquitto.conf file in the same directory with the following content: -# listener 1883 -# allow_anonymous true -# password_file /mosquitto/config/passwordfile - -# Create a password file with the following command: -# mosquitto_passwd -c /mosquitto/config/passwordfile user1 \ No newline at end of file diff --git a/.github/workflows/example2.yml b/.github/workflows/example2.yml deleted file mode 100644 index 784c3ef936..0000000000 --- a/.github/workflows/example2.yml +++ /dev/null @@ -1,20 +0,0 @@ -name: Mosquitto Docker Action (example 2) - -on: [push] - -jobs: - publish-messages: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Run Mosquitto container - run: docker run -d --name mosquitto -p 1883:1883 -v $(pwd)/test/functionalTest/mosquittoConf:/mosquitto/config eclipse-mosquitto - - - name: Publish messages - run: | - docker logs mosquitto - docker exec mosquitto mosquitto_pub -h localhost -t test/topic -m "Hello, World!" - docker exec mosquitto mosquitto_pub -h localhost -t test/topic -m "Another message" \ No newline at end of file diff --git a/.github/workflows/example3.yml b/.github/workflows/example3.yml deleted file mode 100644 index 93a5407dda..0000000000 --- a/.github/workflows/example3.yml +++ /dev/null @@ -1,28 +0,0 @@ -name: Mosquitto Docker Action (example 3) - -on: [push] - -jobs: - publish-messages: - runs-on: ubuntu-latest - - steps: - - name: Checkout repository - uses: actions/checkout@v2 - - - name: Run Mosquitto container - # 1.6.15 fails with "Error: Invalid password hash for user user1, removing entry." - #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: Publish messages - run: | - docker logs mosquitto - docker exec mosquitto mosquitto_pub -h localhost -t test/topic -m "Hello, World!" - docker exec mosquitto mosquitto_pub -h localhost -t test/topic -m "Another message" - docker exec mosquitto mosquitto_pub -h localhost -t test/topic -u user1 -P xxxx -m "Message on auth user" - echo "-------------------" - docker logs mosquitto - #docker exec mosquitto mosquitto_pub -h localhost -t test/topic -u user1 -P xxxxy -m "Message on auth user will fail" - #echo "-------------------" - #docker logs mosquitto \ No newline at end of file diff --git a/.github/workflows/functional.yml b/.github/workflows/functional.yml index 84ac3cd31b..7842ab5255 100644 --- a/.github/workflows/functional.yml +++ b/.github/workflows/functional.yml @@ -38,7 +38,6 @@ jobs: strategy: 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' } @@ -61,7 +60,3 @@ jobs: - 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 - - - name: Log after running test - run: | - docker logs mosquitto diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml index 38281eccca..fa1c722db5 100644 --- a/.github/workflows/unit.yml +++ b/.github/workflows/unit.yml @@ -1,13 +1,13 @@ name: Unit Tests -#on: -# push: -# branches: -# - master -# pull_request: -# branches: -# - master -# - '!checkvalgrind**' +on: + push: + branches: + - master + pull_request: + branches: + - master + - '!checkvalgrind**' concurrency: group: ${{ github.workflow }}-${{ github.ref }}