diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml index 1b035707..187477c5 100644 --- a/.github/workflows/testing.yml +++ b/.github/workflows/testing.yml @@ -135,64 +135,64 @@ jobs: if: always() shell: bash env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} REPORT_FLAGS: ${{ steps.codecov-flags.outputs.flags }},factories REPORT_NAME: ${{ runner.os }}-Py${{ matrix.python-version }}-${{ matrix.salt-version }}-PyTest${{ matrix.pytest-version }}-factories REPORT_PATH: artifacts/coverage-saltfactories.xml run: | - if [ ! -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if curl --max-time 30 -L https://codecov.io/bash --output codecov.sh; then - break - fi + if [ ! -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if curl --max-time 30 -L https://uploader.codecov.io/latest/codecov-linux --output codecov-uploader; then + chmod +x codecov-uploader + break + fi n=$((n+1)) sleep 15 - done + done fi - if [ -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if bash codecov.sh -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then + if [ -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov-uploader -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then break fi n=$((n+1)) sleep 15 - done + done fi - name: Upload Salt Factories Tests Code Coverage if: always() shell: bash env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} REPORT_FLAGS: ${{ steps.codecov-flags.outputs.flags }},factories REPORT_NAME: ${{ runner.os }}-Py${{ matrix.python-version }}-${{ matrix.salt-version }}-PyTest${{ matrix.pytest-version }}-tests REPORT_PATH: artifacts/coverage-tests.xml run: | - if [ ! -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if curl --max-time 30 -L https://codecov.io/bash --output codecov.sh; then - break - fi + if [ ! -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if curl --max-time 30 -L https://uploader.codecov.io/latest/codecov-linux --output codecov-uploader; then + chmod +x codecov-uploader + break + fi n=$((n+1)) sleep 15 - done + done fi - if [ -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if bash codecov.sh -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then + if [ -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov-uploader -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then break fi n=$((n+1)) sleep 15 - done + done fi - name: Upload Logs @@ -265,64 +265,64 @@ jobs: if: always() shell: bash env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} REPORT_FLAGS: ${{ steps.codecov-flags.outputs.flags }},factories REPORT_NAME: ${{ runner.os }}-Py${{ matrix.python-version }}-${{ matrix.salt-version }}-PyTest${{ matrix.pytest-version }}-factories REPORT_PATH: artifacts/coverage-saltfactories.xml run: | - if [ ! -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if curl --max-time 30 -L https://codecov.io/bash --output codecov.sh; then - break - fi + if [ ! -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if curl --max-time 30 -L https://uploader.codecov.io/latest/codecov-linux --output codecov-uploader; then + chmod +x codecov-uploader + break + fi n=$((n+1)) sleep 15 - done + done fi - if [ -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if bash codecov.sh -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then + if [ -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov-uploader -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then break fi n=$((n+1)) sleep 15 - done + done fi - name: Upload Salt Factories Tests Code Coverage if: always() shell: bash env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} REPORT_FLAGS: ${{ steps.codecov-flags.outputs.flags }},factories REPORT_NAME: ${{ runner.os }}-Py${{ matrix.python-version }}-${{ matrix.salt-version }}-PyTest${{ matrix.pytest-version }}-tests REPORT_PATH: artifacts/coverage-tests.xml run: | - if [ ! -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if curl --max-time 30 -L https://codecov.io/bash --output codecov.sh; then - break - fi + if [ ! -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if curl --max-time 30 -L https://uploader.codecov.io/latest/codecov-linux --output codecov-uploader; then + chmod +x codecov-uploader + break + fi n=$((n+1)) sleep 15 - done + done fi - if [ -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if bash codecov.sh -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then + if [ -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov-uploader -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then break fi n=$((n+1)) sleep 15 - done + done fi - name: Upload Logs @@ -392,64 +392,64 @@ jobs: if: always() shell: bash env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} REPORT_FLAGS: ${{ steps.codecov-flags.outputs.flags }},factories REPORT_NAME: ${{ runner.os }}-${{ steps.python-version.outputs.long }}-system-factories REPORT_PATH: artifacts/coverage-saltfactories.xml run: | - if [ ! -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if curl --max-time 30 -L https://codecov.io/bash --output codecov.sh; then - break - fi + if [ ! -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if curl --max-time 30 -L https://uploader.codecov.io/latest/codecov-linux --output codecov-uploader; then + chmod +x codecov-uploader + break + fi n=$((n+1)) sleep 15 - done + done fi - if [ -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if bash codecov.sh -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then + if [ -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov-uploader -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then break fi n=$((n+1)) sleep 15 - done + done fi - name: Upload Salt Factories Tests Code Coverage if: always() shell: bash env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} REPORT_FLAGS: ${{ steps.codecov-flags.outputs.flags }},tests REPORT_NAME: ${{ runner.os }}-${{ steps.python-version.outputs.long }}-system-tests REPORT_PATH: artifacts/coverage-tests.xml run: | - if [ ! -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if curl --max-time 30 -L https://codecov.io/bash --output codecov.sh; then - break - fi + if [ ! -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if curl --max-time 30 -L https://uploader.codecov.io/latest/codecov-linux --output codecov-uploader; then + chmod +x codecov-uploader + break + fi n=$((n+1)) sleep 15 - done + done fi - if [ -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if bash codecov.sh -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then + if [ -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov-uploader -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then break fi n=$((n+1)) sleep 15 - done + done fi - name: Upload Logs @@ -519,64 +519,64 @@ jobs: if: always() shell: bash env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} REPORT_FLAGS: ${{ steps.codecov-flags.outputs.flags }},factories REPORT_NAME: ${{ runner.os }}-Py${{ matrix.python-version }}-${{ matrix.salt-version }}-factories REPORT_PATH: artifacts/coverage-saltfactories.xml run: | - if [ ! -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if curl --max-time 30 -L https://codecov.io/bash --output codecov.sh; then - break - fi + if [ ! -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if curl --max-time 30 -L https://uploader.codecov.io/latest/codecov-linux --output codecov-uploader; then + chmod +x codecov-uploader + break + fi n=$((n+1)) sleep 15 - done + done fi - if [ -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if bash codecov.sh -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then + if [ -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov-uploader -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then break fi n=$((n+1)) sleep 15 - done + done fi - name: Upload Salt Factories Tests Code Coverage if: always() shell: bash env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} REPORT_FLAGS: ${{ steps.codecov-flags.outputs.flags }},factories REPORT_NAME: ${{ runner.os }}-Py${{ matrix.python-version }}-${{ matrix.salt-version }}-tests REPORT_PATH: artifacts/coverage-tests.xml run: | - if [ ! -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if curl --max-time 30 -L https://codecov.io/bash --output codecov.sh; then - break - fi + if [ ! -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if curl --max-time 30 -L https://uploader.codecov.io/latest/codecov-linux --output codecov-uploader; then + chmod +x codecov-uploader + break + fi n=$((n+1)) sleep 15 - done + done fi - if [ -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if bash codecov.sh -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then + if [ -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov-uploader -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then break fi n=$((n+1)) sleep 15 - done + done fi - name: Upload Logs @@ -642,64 +642,64 @@ jobs: if: always() shell: bash env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} REPORT_FLAGS: ${{ steps.codecov-flags.outputs.flags }},factories REPORT_NAME: ${{ runner.os }}-Py${{ matrix.python-version }}-${{ matrix.salt-version }}-factories REPORT_PATH: artifacts/coverage-saltfactories.xml run: | - if [ ! -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if curl --max-time 30 -L https://codecov.io/bash --output codecov.sh; then - break - fi + if [ ! -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if curl --max-time 30 -L https://uploader.codecov.io/latest/codecov-linux --output codecov-uploader; then + chmod +x codecov-uploader + break + fi n=$((n+1)) sleep 15 - done + done fi - if [ -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if bash codecov.sh -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then + if [ -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov-uploader -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then break fi n=$((n+1)) sleep 15 - done + done fi - name: Upload Salt Factories Tests Code Coverage if: always() shell: bash env: - CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }} REPORT_FLAGS: ${{ steps.codecov-flags.outputs.flags }},factories REPORT_NAME: ${{ runner.os }}-Py${{ matrix.python-version }}-${{ matrix.salt-version }}-tests REPORT_PATH: artifacts/coverage-tests.xml run: | - if [ ! -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if curl --max-time 30 -L https://codecov.io/bash --output codecov.sh; then - break - fi + if [ ! -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if curl --max-time 30 -L https://uploader.codecov.io/latest/codecov-linux --output codecov-uploader; then + chmod +x codecov-uploader + break + fi n=$((n+1)) sleep 15 - done + done fi - if [ -f codecov.sh ]; then - n=0 - until [ "$n" -ge 5 ] - do - if bash codecov.sh -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then + if [ -f codecov-uploader ]; then + n=0 + until [ "$n" -ge 5 ] + do + if ./codecov-uploader -R $(pwd) -n "${REPORT_NAME}" -f "${REPORT_PATH}" -F "${REPORT_FLAGS}"; then break fi n=$((n+1)) sleep 15 - done + done fi - name: Upload Logs diff --git a/changelog/72.trivial.rst b/changelog/72.trivial.rst new file mode 100644 index 00000000..2b746431 --- /dev/null +++ b/changelog/72.trivial.rst @@ -0,0 +1 @@ +Switch to the `new codecov uploader `_ diff --git a/tests/functional/utils/salt/__init__.py b/tests/functional/utils/saltext/__init__.py similarity index 100% rename from tests/functional/utils/salt/__init__.py rename to tests/functional/utils/saltext/__init__.py diff --git a/tests/functional/utils/salt/test_log_handlers.py b/tests/functional/utils/saltext/test_log_handlers.py similarity index 100% rename from tests/functional/utils/salt/test_log_handlers.py rename to tests/functional/utils/saltext/test_log_handlers.py diff --git a/tests/integration/utils/salt/__init__.py b/tests/integration/utils/saltext/__init__.py similarity index 100% rename from tests/integration/utils/salt/__init__.py rename to tests/integration/utils/saltext/__init__.py diff --git a/tests/integration/utils/salt/test_log_handlers.py b/tests/integration/utils/saltext/test_log_handlers.py similarity index 100% rename from tests/integration/utils/salt/test_log_handlers.py rename to tests/integration/utils/saltext/test_log_handlers.py diff --git a/tests/unit/utils/salt/__init__.py b/tests/unit/utils/saltext/__init__.py similarity index 100% rename from tests/unit/utils/salt/__init__.py rename to tests/unit/utils/saltext/__init__.py diff --git a/tests/unit/utils/salt/test_log_handlers.py b/tests/unit/utils/saltext/test_log_handlers.py similarity index 100% rename from tests/unit/utils/salt/test_log_handlers.py rename to tests/unit/utils/saltext/test_log_handlers.py