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

Upgrade OPM to 1.21.0 #399

Merged
merged 1 commit into from
Apr 4, 2022
Merged

Upgrade OPM to 1.21.0 #399

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion docker/Dockerfile-workers
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RUN dnf -y install \
&& dnf update -y \
&& dnf clean all

ADD https://github.com/operator-framework/operator-registry/releases/download/v1.19.5/linux-amd64-opm /usr/bin/opm
ADD https://github.com/operator-framework/operator-registry/releases/download/v1.21.0/linux-amd64-opm /usr/bin/opm
RUN chmod +x /usr/bin/opm
ADD https://github.com/fullstorydev/grpcurl/releases/download/v1.8.5/grpcurl_1.8.5_linux_x86_64.tar.gz /src/grpcurl_1.8.5_linux_x86_64.tar.gz
RUN cd /usr/bin && tar -xf /src/grpcurl_1.8.5_linux_x86_64.tar.gz grpcurl && rm -f /src/grpcurl_1.8.5_linux_x86_64.tar.gz
Expand Down
1 change: 0 additions & 1 deletion iib/workers/tasks/opm_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,6 @@ def opm_generate_dockerfile(fbc_dir, base_dir, index_db, binary_image, dockerfil

cmd = [
'opm',
'alpha',
'generate',
'dockerfile',
os.path.abspath(fbc_dir),
Expand Down
4 changes: 2 additions & 2 deletions tests/test_workers/test_tasks/test_opm_operations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ def create_dockerfile(*args, **kwargs):
df_name = dockerfile if dockerfile else f"{os.path.basename(fbc_dir)}.Dockerfile"

mock_run_cmd.assert_called_once_with(
['opm', 'alpha', 'generate', 'dockerfile', fbc_dir, '--binary-image', 'some:image'],
['opm', 'generate', 'dockerfile', fbc_dir, '--binary-image', 'some:image'],
{'cwd': tmpdir},
exc_msg='Failed to generate Dockerfile for file-based catalog',
)
Expand All @@ -223,7 +223,7 @@ def test_opm_generate_dockerfile_no_dockerfile(mock_run_cmd, tmpdir, set_index_d
)

mock_run_cmd.assert_called_once_with(
['opm', 'alpha', 'generate', 'dockerfile', fbc_dir, '--binary-image', 'some:image'],
['opm', 'generate', 'dockerfile', fbc_dir, '--binary-image', 'some:image'],
{'cwd': tmpdir},
exc_msg='Failed to generate Dockerfile for file-based catalog',
)
Expand Down