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.

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

Introduce solver ubi9 #5217

Merged
merged 2 commits into from
Sep 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
23 changes: 19 additions & 4 deletions .aicoe-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,24 @@ check:
- overlays-build
overlays_dir: overlays
overlays:
- name: solver-rhel-9-py39
build:
base-image: quay.io/thoth-station/s2i-thoth-ubi9-py39:v0.35.0
build-stratergy: 'Source'
custom-tag: 'latest'
registry: quay.io
registry-org: thoth-station
registry-project: 'solver-rhel-9-py39'
registry-secret: thoth-station-thoth-pusher-secret
deploy:
image-name: 'solver-rhel-9-py39'
overlay-contextpath: 'solver/overlays/test/imagestreamtag.yaml'
project-name: thoth-application
project-org: thoth-station

- name: solver-rhel-8-py38
build:
base-image: quay.io/thoth-station/s2i-thoth-ubi8-py38:v0.24.2
base-image: quay.io/thoth-station/s2i-thoth-ubi8-py38:v0.35.0
build-stratergy: 'Source'
custom-tag: 'latest'
registry: quay.io
Expand All @@ -19,7 +34,7 @@ overlays:

- name: solver-rhel-8-py36
build:
base-image: quay.io/thoth-station/s2i-thoth-ubi8-py36:v0.24.2
base-image: quay.io/thoth-station/s2i-thoth-ubi8-py36:v0.35.0
build-stratergy: 'Source'
custom-tag: 'latest'
registry: quay.io
Expand All @@ -34,7 +49,7 @@ overlays:

- name: solver-fedora-34-py39
build:
base-image: quay.io/thoth-station/s2i-thoth-f34-py39:v0.29.0
base-image: quay.io/thoth-station/s2i-thoth-f34-py39:v0.35.0
build-stratergy: 'Source'
custom-tag: 'latest'
registry: quay.io
Expand All @@ -49,7 +64,7 @@ overlays:

- name: solver-fedora-35-py310
build:
base-image: quay.io/thoth-station/s2i-thoth-f35-py310:v0.32.3
base-image: quay.io/thoth-station/s2i-thoth-f35-py310:v0.35.0
build-stratergy: 'Source'
custom-tag: 'latest'
registry: quay.io
Expand Down
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
---
repos:
- repo: https://github.com/asottile/add-trailing-comma
rev: v2.1.0
rev: v2.2.3
hooks:
- id: add-trailing-comma

- repo: https://github.com/Lucas-C/pre-commit-hooks
rev: v1.1.9
rev: v1.3.1
hooks:
- id: remove-tabs

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v3.4.0
rev: v4.3.0
hooks:
- id: trailing-whitespace
- id: check-merge-conflict
Expand All @@ -28,6 +28,6 @@ repos:
- id: debug-statements

- repo: https://github.com/pycqa/pydocstyle.git
rev: "5.1.1"
rev: "6.1.1"
hooks:
- id: pydocstyle
4 changes: 2 additions & 2 deletions .prow.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ presubmits:
context: aicoe-ci/prow/pre-commit
spec:
containers:
- image: quay.io/thoth-station/thoth-precommit-py38:v0.12.7
- image: quay.io/thoth-station/thoth-precommit-py38:v0.15.0
command:
- "pre-commit"
- "run"
Expand All @@ -19,7 +19,7 @@ presubmits:
context: aicoe-ci/prow/pytest
spec:
containers:
- image: quay.io/thoth-station/thoth-pytest-py38:v0.12.8
- image: quay.io/thoth-station/thoth-pytest-py38:v0.15.0
command:
- "/bin/run-pytest"
resources:
Expand Down
20 changes: 12 additions & 8 deletions .thoth.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,31 +10,39 @@ runtime_environments:
version: "34"
python_version: "3.9"
recommendation_type: latest
base_image: quay.io/thoth-station/s2i-thoth-f34-py39:v0.29.0
base_image: quay.io/thoth-station/s2i-thoth-f34-py39:v0.35.0

- name: solver-fedora-35-py310
operating_system:
name: "fedora"
version: "35"
python_version: "3.10"
recommendation_type: latest
base_image: quay.io/thoth-station/s2i-thoth-f35-py310:v0.32.3
base_image: quay.io/thoth-station/s2i-thoth-f35-py310:v0.35.0

- name: solver-rhel-8-py36
operating_system:
name: "rhel"
version: "8"
python_version: "3.6"
recommendation_type: latest
base_image: quay.io/thoth-station/s2i-thoth-ubi8-py36:v0.24.2
base_image: quay.io/thoth-station/s2i-thoth-ubi8-py36:v0.35.0

- name: solver-rhel-8-py38
operating_system:
name: "rhel"
version: "8"
python_version: "3.8"
recommendation_type: latest
base_image: quay.io/thoth-station/s2i-thoth-ubi8-py38:v0.24.2
base_image: quay.io/thoth-station/s2i-thoth-ubi8-py38:v0.35.0

- name: solver-rhel-9-py39
operating_system:
name: "rhel"
version: "9"
python_version: "3.9"
recommendation_type: latest
base_image: quay.io/thoth-station/s2i-thoth-ubi9-py39:v0.35.0

managers:
- name: pipfile-requirements
Expand All @@ -44,10 +52,6 @@ managers:
- name: info
- name: version
configuration:
maintainers:
- goern
- fridex
- harshad16
assignees:
- sesheta
labels: [bot]
Expand Down
12 changes: 10 additions & 2 deletions OWNERS
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# See the OWNERS docs at https://go.k8s.io/owners

approvers:
- fridex
- pacospace
- goern
- kpostoffice
- harshad16
- mayaCostantini
- sesheta

reviewers:
- kpostoffice
- harshad16
- mayaCostantini

emeritus_approvers:
- pacospace
- fridex
1 change: 1 addition & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ pytest-venv = "*"
mypy = "*"
pytest-mypy = "*"
types-setuptools = "*"
pipdeptree = "*"

[requires]
python_version = "3.8"
Loading