Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update CI Image #1171

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

Update CI Image #1171

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
480cbb3
Upgrade ubuntu version
TimPansino Jun 27, 2024
6450079
Upgrade Python versions
TimPansino Jun 27, 2024
247ac84
Update test runners to ubuntu-latest
TimPansino Jun 27, 2024
639445e
TEMP - Pin dev image sha
TimPansino Jun 27, 2024
1f88f41
Merge branch 'main' into update-ci-image
mergify[bot] Jun 27, 2024
ca71d35
Merge branch 'main' into update-ci-image
mergify[bot] Jun 27, 2024
7362b1f
Merge branch 'main' into update-ci-image
mergify[bot] Jul 3, 2024
7230181
Merge branch 'main' into update-ci-image
mergify[bot] Jul 9, 2024
55fac7d
Merge branch 'main' into update-ci-image
mergify[bot] Jul 10, 2024
a46d351
Merge branch 'main' into update-ci-image
mergify[bot] Jul 11, 2024
d20c77a
Merge branch 'main' into update-ci-image
mergify[bot] Jul 11, 2024
352cfb4
Merge branch 'main' into update-ci-image
TimPansino Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .github/containers/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM ubuntu:20.04
FROM ubuntu:24.04

# Install OS packages
RUN export DEBIAN_FRONTEND=noninteractive && \
Expand Down Expand Up @@ -45,7 +45,6 @@ RUN export DEBIAN_FRONTEND=noninteractive && \
make \
odbc-postgresql \
openssl \
python2-dev \
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI These headers are apparently not needed.

python3-dev \
python3-pip \
sudo \
Expand Down Expand Up @@ -96,7 +95,7 @@ RUN echo 'eval "$(pyenv init -)"' >>${HOME}/.bashrc && \
pyenv update

# Install Python
ARG PYTHON_VERSIONS="3.11 3.10 3.9 3.8 3.7 3.12 2.7 pypy2.7-7.3.12 pypy3.10-7.3.15"
ARG PYTHON_VERSIONS="3.12 3.11 3.10 3.9 3.8 3.7 2.7 pypy2.7-7.3.16 pypy3.10-7.3.16"
COPY --chown=1000:1000 --chmod=+x ./install-python.sh /tmp/install-python.sh
RUN /tmp/install-python.sh && \
rm /tmp/install-python.sh
Expand Down
68 changes: 34 additions & 34 deletions .github/workflows/tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ concurrency:
jobs:
# Aggregate job that provides a single check for all tests passing
tests:
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
needs:
- python
- elasticsearchserver07
Expand All @@ -57,7 +57,7 @@ jobs:
# Combine and upload coverage data
coverage:
if: success() || failure() # Does not run on cancelled workflows
runs-on: ubuntu-20.04
runs-on: ubuntu-latest
needs:
- tests

Expand Down Expand Up @@ -119,9 +119,9 @@ jobs:
20,
]

runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
image: ghcr.io/newrelic/newrelic-python-agent-ci@sha256:d7cb3fb83a414571c41c26b42aa3e8abf621cf24a3c5f8be273ac4da7d7131e1
options: >-
--add-host=host.docker.internal:host-gateway
timeout-minutes: 30
Expand Down Expand Up @@ -168,9 +168,9 @@ jobs:
matrix:
group-number: [1]

runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
image: ghcr.io/newrelic/newrelic-python-agent-ci@sha256:d7cb3fb83a414571c41c26b42aa3e8abf621cf24a3c5f8be273ac4da7d7131e1
options: >-
--add-host=host.docker.internal:host-gateway
timeout-minutes: 30
Expand Down Expand Up @@ -217,9 +217,9 @@ jobs:
matrix:
group-number: [1, 2]

runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
image: ghcr.io/newrelic/newrelic-python-agent-ci@sha256:d7cb3fb83a414571c41c26b42aa3e8abf621cf24a3c5f8be273ac4da7d7131e1
options: >-
--add-host=host.docker.internal:host-gateway
timeout-minutes: 30
Expand Down Expand Up @@ -281,9 +281,9 @@ jobs:
matrix:
group-number: [1]

runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
image: ghcr.io/newrelic/newrelic-python-agent-ci@sha256:d7cb3fb83a414571c41c26b42aa3e8abf621cf24a3c5f8be273ac4da7d7131e1
options: >-
--add-host=host.docker.internal:host-gateway
timeout-minutes: 30
Expand Down Expand Up @@ -345,9 +345,9 @@ jobs:
matrix:
group-number: [1]

runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
image: ghcr.io/newrelic/newrelic-python-agent-ci@sha256:d7cb3fb83a414571c41c26b42aa3e8abf621cf24a3c5f8be273ac4da7d7131e1
options: >-
--add-host=host.docker.internal:host-gateway
timeout-minutes: 30
Expand Down Expand Up @@ -412,9 +412,9 @@ jobs:
matrix:
group-number: [1, 2]

runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
image: ghcr.io/newrelic/newrelic-python-agent-ci@sha256:d7cb3fb83a414571c41c26b42aa3e8abf621cf24a3c5f8be273ac4da7d7131e1
options: >-
--add-host=host.docker.internal:host-gateway
timeout-minutes: 30
Expand Down Expand Up @@ -479,9 +479,9 @@ jobs:
matrix:
group-number: [1]

runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
image: ghcr.io/newrelic/newrelic-python-agent-ci@sha256:d7cb3fb83a414571c41c26b42aa3e8abf621cf24a3c5f8be273ac4da7d7131e1
options: >-
--add-host=host.docker.internal:host-gateway
timeout-minutes: 30
Expand Down Expand Up @@ -582,9 +582,9 @@ jobs:
matrix:
group-number: [1, 2]

runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
image: ghcr.io/newrelic/newrelic-python-agent-ci@sha256:d7cb3fb83a414571c41c26b42aa3e8abf621cf24a3c5f8be273ac4da7d7131e1
options: >-
--add-host=host.docker.internal:host-gateway
timeout-minutes: 30
Expand Down Expand Up @@ -644,9 +644,9 @@ jobs:
matrix:
group-number: [1]

runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
image: ghcr.io/newrelic/newrelic-python-agent-ci@sha256:d7cb3fb83a414571c41c26b42aa3e8abf621cf24a3c5f8be273ac4da7d7131e1
options: >-
--add-host=host.docker.internal:host-gateway
timeout-minutes: 30
Expand Down Expand Up @@ -708,9 +708,9 @@ jobs:
matrix:
group-number: [1, 2]

runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
image: ghcr.io/newrelic/newrelic-python-agent-ci@sha256:d7cb3fb83a414571c41c26b42aa3e8abf621cf24a3c5f8be273ac4da7d7131e1
options: >-
--add-host=host.docker.internal:host-gateway
timeout-minutes: 30
Expand Down Expand Up @@ -770,9 +770,9 @@ jobs:
matrix:
group-number: [1]

runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
image: ghcr.io/newrelic/newrelic-python-agent-ci@sha256:d7cb3fb83a414571c41c26b42aa3e8abf621cf24a3c5f8be273ac4da7d7131e1
options: >-
--add-host=host.docker.internal:host-gateway
timeout-minutes: 30
Expand Down Expand Up @@ -833,9 +833,9 @@ jobs:
matrix:
group-number: [1, 2, 3, 4]

runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
image: ghcr.io/newrelic/newrelic-python-agent-ci@sha256:d7cb3fb83a414571c41c26b42aa3e8abf621cf24a3c5f8be273ac4da7d7131e1
options: >-
--add-host=host.docker.internal:host-gateway
timeout-minutes: 30
Expand Down Expand Up @@ -907,9 +907,9 @@ jobs:
matrix:
group-number: [1]

runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
image: ghcr.io/newrelic/newrelic-python-agent-ci@sha256:d7cb3fb83a414571c41c26b42aa3e8abf621cf24a3c5f8be273ac4da7d7131e1
options: >-
--add-host=host.docker.internal:host-gateway
timeout-minutes: 30
Expand Down Expand Up @@ -969,9 +969,9 @@ jobs:
matrix:
group-number: [1]

runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
image: ghcr.io/newrelic/newrelic-python-agent-ci@sha256:d7cb3fb83a414571c41c26b42aa3e8abf621cf24a3c5f8be273ac4da7d7131e1
options: >-
--add-host=host.docker.internal:host-gateway
timeout-minutes: 30
Expand Down Expand Up @@ -1033,9 +1033,9 @@ jobs:
matrix:
group-number: [1]

runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
image: ghcr.io/newrelic/newrelic-python-agent-ci@sha256:d7cb3fb83a414571c41c26b42aa3e8abf621cf24a3c5f8be273ac4da7d7131e1
options: >-
--add-host=host.docker.internal:host-gateway
timeout-minutes: 30
Expand Down Expand Up @@ -1098,9 +1098,9 @@ jobs:
matrix:
group-number: [1]

runs-on: ubuntu-20.04
runs-on: ubuntu-latest
container:
image: ghcr.io/newrelic/newrelic-python-agent-ci:latest
image: ghcr.io/newrelic/newrelic-python-agent-ci@sha256:d7cb3fb83a414571c41c26b42aa3e8abf621cf24a3c5f8be273ac4da7d7131e1
options: >-
--add-host=host.docker.internal:host-gateway
timeout-minutes: 30
Expand Down
Loading