Commit eae00a65 authored by Adrian DC's avatar Adrian DC
Browse files

ci(gitlab-ci): raise oldest Python test images from 3.6 to 3.7 

Signed-off-by: default avatarAdrian DC <radian.dc@gmail.com>
parent c4a56177

.gitlab-ci.yml

+10 −10
Changes for .gitlab-ci.yml: 10 added lines, 10 removed lines.
Original line number Diff line number Diff line
@@ -83,8 +83,8 @@ images: 
          debian:testing-slim \

          docker:dind \

          docker:latest \

          python:3.6 \

          python:3.6-alpine \

          python:3.7 \

          python:3.7-alpine \

          python:3.11 \

          python:3.11-alpine \

          ruby:3.1 \
@@ -311,7 +311,7 @@ images: 
      fi

    # Prepare test-oldest-docker image

    - |

      base='python:3.6'

      base='python:3.7'

      image='gcil:test-oldest-docker'

      if [ -z "${IMAGE}" ] || echo "${image}" | grep -q "${IMAGE}"; then

        echo ''
@@ -361,7 +361,7 @@ images: 
      fi

    # Prepare test-oldest-podman image

    - |

      base='python:3.6'

      base='python:3.7'

      image='gcil:test-oldest-podman'

      if [ -z "${IMAGE}" ] || echo "${image}" | grep -q "${IMAGE}"; then

        echo ''
@@ -757,7 +757,7 @@ coverage:windows: 
# =============================================================================

# Stage: test (Docker)



py3.6:docker:

py3.7:docker:

  extends:

    - .unit-tests-template

    - .unit-tests-docker
@@ -778,7 +778,7 @@ py3.11:docker: 
# =============================================================================

# Stage: test (Podman)



py3.6:podman:

py3.7:podman:

  extends:

    - .unit-tests-template

    - .unit-tests-podman
@@ -882,11 +882,11 @@ deploy:release: 
      artifacts: false

    - job: coverage:windows

      artifacts: false

    - job: py3.6:docker

    - job: py3.7:docker

      artifacts: false

    - job: py3.11:docker

      artifacts: false

    - job: py3.6:podman

    - job: py3.7:podman

      artifacts: false

    - job: py3.11:podman

      artifacts: false
@@ -935,11 +935,11 @@ deploy:trial: 
      artifacts: false

    - job: coverage:windows

      artifacts: false

    - job: py3.6:docker

    - job: py3.7:docker

      artifacts: false

    - job: py3.11:docker

      artifacts: false

    - job: py3.6:podman

    - job: py3.7:podman

      artifacts: false

    - job: py3.11:podman

      artifacts: false

tests/parallel/.gitlab-ci.yml

+4 −4
Changes for tests/parallel/.gitlab-ci.yml: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ stages: 
  stage: parallel

  parallel:

    matrix:

      - PYTHON_VERSION: ['3.6', '3.11']

      - PYTHON_VERSION: ['3.7', '3.11']

  script:

    - echo 'Job 1'

    - echo "${PYTHON_VERSION}"
@@ -16,7 +16,7 @@ stages: 
  stage: parallel

  parallel:

    matrix:

      - PYTHON_VERSION: ['3.6', '3.11']

      - PYTHON_VERSION: ['3.7', '3.11']

        VALUE1:

          - '1'

          - '2'
@@ -24,7 +24,7 @@ stages: 
        VALUE2:

          - '1'

          - '2'

      - PYTHON_VERSION: ['3.6', '3.11']

      - PYTHON_VERSION: ['3.7', '3.11']

        VALUE1:

          - '3'

          - '2'
@@ -50,7 +50,7 @@ stages: 
  stage: parallel

  parallel:

    matrix:

      - PYTHON_VERSION: '3.6'

      - PYTHON_VERSION: '3.7'

  script:

    - echo 'Job 3'

    - echo "${PYTHON_VERSION}"

tests/parallel/test.sh

+5 −5
Changes for tests/parallel/test.sh: 5 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ unset PYTHON_VERSION 


# Run tests

gitlabci-local 'Job 1'

gitlabci-local -e PYTHON_VERSION=3.6 'Job 1'

gitlabci-local -e PYTHON_VERSION=3.7 'Job 1'

gitlabci-local -e PYTHON_VERSION=0.0 'Job 1' && exit 1 || true

gitlabci-local -H 'Job 2'

gitlabci-local -H -e VALUE1= 'Job 2' && exit 1 || true
@@ -22,8 +22,8 @@ gitlabci-local -H -e VALUE1=4 'Job 2' && exit 1 || true 
gitlabci-local -H -e VALUE2= 'Job 2' && exit 1 || true

gitlabci-local -H -e VALUE2=2 'Job 2'

gitlabci-local -H -e VALUE2=3 'Job 2' && exit 1 || true

gitlabci-local -H 'Job 2: [3.6, 1, 1]'

gitlabci-local -H -e VALUE2=2 'Job 2: [3.6, 1, 1]' && exit 1 || true

gitlabci-local -H 'Job 2: [3.6, 1, 2]'

gitlabci-local -H 'Job 2: [3.6, 1, 3]' && exit 1 || true

gitlabci-local -H 'Job 2: [3.7, 1, 1]'

gitlabci-local -H -e VALUE2=2 'Job 2: [3.7, 1, 1]' && exit 1 || true

gitlabci-local -H 'Job 2: [3.7, 1, 2]'

gitlabci-local -H 'Job 2: [3.7, 1, 3]' && exit 1 || true

gitlabci-local 'Job 3'