Skip to content

OCPQE-7624: Replaces ruby build images with multiarch one #2568

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

Merged
openshift-merge-robot merged 1 commit into from
Dec 9, 2021
Merged

OCPQE-7624: Replaces ruby build images with multiarch one #2568

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
4 changes: 2 additions & 2 deletions features/build/buildlogic.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,13 +64,13 @@ Feature: buildlogic.feature
Given I have a project
When I run the :new_build client command with:
| app_repo | https://github.com/openshift/ruby-hello-world |
| D | FROM quay.io/openshifttest/ruby-25-centos7:build\nRUN echo ok |
| D | FROM quay.io/openshifttest/ruby-27:multiarch\nRUN echo ok |
Then the step should succeed
When I get project buildconfigs as YAML
Then the step should succeed
Then the output should match:
| dockerfile |
| FROM quay.io/openshifttest/ruby-25-centos7:build |
| FROM quay.io/openshifttest/ruby-27:multiarch |
| RUN echo ok |
| uri: https://github.com/openshift/ruby-hello-world |
| type: [Gg]it |
Expand Down
4 changes: 2 additions & 2 deletions features/build/dockerbuild.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Feature: dockerbuild.feature
Scenario: Docker build with dockerImage with specified tag
Given I have a project
When I run the :new_app client command with:
| docker_image | quay.io/openshifttest/ruby-27-centos7:centos7 |
| docker_image | quay.io/openshifttest/ruby-27:multiarch |
| app_repo | https://github.com/openshift/ruby-hello-world |
| strategy | docker |
Then the step should succeed
Expand Down Expand Up @@ -95,7 +95,7 @@ Feature: dockerbuild.feature
Given I have a project
When I run the :new_build client command with:
| code | https://github.com/openshift/ruby-hello-world.git |
| docker_image | quay.io/openshifttest/ruby-27-centos7:centos7 |
| docker_image | quay.io/openshifttest/ruby-27:multiarch |
| strategy | docker |
| build_arg | ARG=VALUE |
Then the step should succeed
Expand Down
18 changes: 9 additions & 9 deletions features/build/stibuild.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,14 @@ Feature: stibuild.feature
Scenario: STI build with dockerImage with specified tag
Given I have a project
When I run the :new_app client command with:
| docker_image | quay.io/openshifttest/ruby-22-centos7:2.2 |
| app_repo | https://github.com/openshift-qe/ruby-ex |
| docker_image | quay.io/openshifttest/ruby-27:multiarch |
| app_repo | https://github.com/sclorg/ruby-ex |
Then the step should succeed
And the "ruby-ex-1" build completes
When I run the :patch client command with:
| resource | buildconfig |
| resource_name | ruby-ex |
| p | {"spec": {"strategy": {"sourceStrategy": {"from": {"kind": "DockerImage","name": "quay.io/openshifttest/ruby-25-centos7@sha256:575194aa8be12ea066fc3f4aa9103dcb4291d43f9ee32e4afe34e0063051610b"}}},"type": "Source"}} |
| p | {"spec": {"strategy": {"sourceStrategy": {"from": {"kind": "DockerImage","name": "quay.io/openshifttest/ruby-27@sha256:cdb6a13032184468b1e0607f36cfb8834c97dbeffeeff800e9e6834323bed8fc"}}},"type": "Source"}} |
Then the step should succeed
When I run the :start_build client command with:
| buildconfig | ruby-ex |
Expand Down Expand Up @@ -133,7 +133,7 @@ Feature: stibuild.feature
@vsphere-ipi @openstack-ipi @gcp-ipi @baremetal-ipi @azure-ipi @aws-ipi
@vsphere-upi @openstack-upi @gcp-upi @azure-upi @aws-upi
@upgrade-sanity
Scenario: Mount source secret and configmap to builder container- sourcestrategy
Scenario: Mount source secret and configmap to builder container- sourcestrategy
Given I have a project
When I run the :create_secret client command with:
| secret_type | generic |
Expand All @@ -142,20 +142,20 @@ Feature: stibuild.feature
| from_literal | password=redhat |
Then the step should succeed
When I run the :create_configmap client command with:
| name | myconfig |
| name | myconfig |
| from_literal | key=foo |
| from_literal | value=bar |
Then the step should succeed
When I run the :new_app client command with:
| image_stream | ruby |
| app_repo | https://github.com/openshift/ruby-hello-world.git |
| app_repo | https://github.com/openshift/ruby-hello-world.git |
Then the step should succeed
And the "ruby-hello-world-1" build was created
Given the "ruby-hello-world-1" build completed
When I run the :patch client command with:
| resource | buildconfig |
| resource | buildconfig |
| resource_name | ruby-hello-world |
| p | {"spec":{"strategy":{"sourceStrategy":{"volumes":[{"mounts":[{"destinationPath":"/var/run/secret/mysecret"}],"name":"mysecret","source":{"secret":{"secretName":"mysecret"},"type":"Secret"}},{"mounts":[{"destinationPath":"/var/run/secret/myconfig"}],"name":"myconfig","source":{"configMap":{"name":"myconfig"},"type":"ConfigMap"}}]}}}} |
| p | {"spec":{"strategy":{"sourceStrategy":{"volumes":[{"mounts":[{"destinationPath":"/var/run/secret/mysecret"}],"name":"mysecret","source":{"secret":{"secretName":"mysecret"},"type":"Secret"}},{"mounts":[{"destinationPath":"/var/run/secret/myconfig"}],"name":"myconfig","source":{"configMap":{"name":"myconfig"},"type":"ConfigMap"}}]}}}} |
Then the step should succeed
When I run the :start_build client command with:
| buildconfig | ruby-hello-world |
Expand All @@ -168,4 +168,4 @@ Feature: stibuild.feature
| o | yaml |
Then the output should contain:
| mysecret-user-build-volume |
| myconfig-user-build-volume |
| myconfig-user-build-volume |
18 changes: 9 additions & 9 deletions features/cli/build.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,21 +233,21 @@ Feature: build 'apps' with CLI
Given I have a project
When I run the :tag client command with:
| source | quay.io/openshifttest/python:3.6 |
| dest | python:latest |
| dest | python:multiarch |
Then the step should succeed
And the "python" image stream becomes ready
When I run the :new_build client command with:
| app_repo | openshift/ruby:latest |
| app_repo | https://github.com/openshift/ruby-hello-world |
| source_image | <%= project.name %>/python:latest |
| source_image | <%= project.name %>/python:multiarch |
| source_image_path | /tmp:xiuwangtest/ |
| name | final-app |
| allow_missing_imagestream_tags| true |
Then the step should succeed
When I get project build_config named "final-app" as YAML
Then the output should match:
| kind:\s+ImageStreamTag |
| name:\s+python:latest |
| name:\s+python:multiarch |
| destinationDir:\s+xiuwangtest |
| sourcePath:\s+/tmp |
Given the "final-app-1" build completes
Expand Down Expand Up @@ -282,7 +282,7 @@ Feature: build 'apps' with CLI
| image_name | python |
| all | true |
| confirm | true |
| from | quay.io/openshifttest/ruby-25-centos7 |
| from | quay.io/openshifttest/ruby-27 |
| n | <%= project.name %> |
Then the step should succeed
Given I get project builds
Expand Down Expand Up @@ -740,15 +740,15 @@ Feature: build 'apps' with CLI
Scenario: io.openshift.build.commit.ref displays correctly in build reference on imagestreamtag if building from git branch reference
Given I have a project
When I run the :new_app client command with:
| app_repo | quay.io/openshifttest/ruby-22-centos7:2.2~https://github.com/openshift/ruby-hello-world#beta4 |
| app_repo | quay.io/openshifttest/ruby-27:multiarch~https://github.com/openshift/ruby-hello-world#config |
Then the step should succeed
Given the "ruby-hello-world-1" build was created
And the "ruby-hello-world-1" build completed
When I run the :describe client command with:
| resource | imagestreamtag |
Then the output should contain:
| io.openshift.build.commit.ref=beta4 |
| OPENSHIFT_BUILD_REFERENCE=beta4 |
| io.openshift.build.commit.ref=config |
| OPENSHIFT_BUILD_REFERENCE=config |

# @author xiuwang@redhat.com
# @case_id OCP-19631
Expand Down Expand Up @@ -914,7 +914,7 @@ Feature: build 'apps' with CLI
Then the step should succeed
#Insert cm and secret to bc with empty destination - succeed
When I run the :new_build client command with:
| app_repo | quay.io/openshifttest/ruby-27-centos7:centos7~https://github.com/openshift/ruby-hello-world |
| app_repo | quay.io/openshifttest/ruby-27:multiarch~https://github.com/openshift/ruby-hello-world |
| build_config_map | cmtest1:. |
| build_config_map | cmtest2:./newdir |
| strategy | docker |
Expand Down Expand Up @@ -946,7 +946,7 @@ Feature: build 'apps' with CLI
Then the step should succeed
#Add a configmaps with a multi-level dirs - succeed
When I run the :new_build client command with:
| app_repo | quay.io/openshifttest/ruby-27-centos7:centos7~https://github.com/openshift/ruby-hello-world |
| app_repo | quay.io/openshifttest/ruby-27:multiarch~https://github.com/openshift/ruby-hello-world |
| build_config_map | cmtest1:./newdir1/newdir2/newdir3 |
| strategy | docker |
Then the step should succeed
Expand Down
4 changes: 2 additions & 2 deletions features/test/registry.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Feature: registry related test scenario
And I log into auth registry on the node
When I docker push on the node to the registry the following images:
| quay.io/openshifttest/base-alpine@sha256:0b379877aba876774e0043ea5ba41b0c574825ab910d32b43c05926fab4eea22 | busybox:latest |
| quay.io/openshifttest/ruby-25-centos7@sha256:575194aa8be12ea066fc3f4aa9103dcb4291d43f9ee32e4afe34e0063051610b | test/centos7 |
| quay.io/openshifttest/ruby-27@sha256:cdb6a13032184468b1e0607f36cfb8834c97dbeffeeff800e9e6834323bed8fc | test/centos7 |
Then the step should succeed

@admin
Expand All @@ -68,7 +68,7 @@ Feature: registry related test scenario
And I add the insecure registry to docker config on the node
When I docker push on the node to the registry the following images:
| quay.io/openshifttest/base-alpine@sha256:0b379877aba876774e0043ea5ba41b0c574825ab910d32b43c05926fab4eea22 | busybox:latest |
| quay.io/openshifttest/ruby-25-centos7@sha256:575194aa8be12ea066fc3f4aa9103dcb4291d43f9ee32e4afe34e0063051610b | test/centos7 |
| quay.io/openshifttest/ruby-27@sha256:cdb6a13032184468b1e0607f36cfb8834c97dbeffeeff800e9e6834323bed8fc | test/centos7 |
Then the step should fail

Scenario: Obtain registry ip by creating a build in the project
Expand Down
2 changes: 1 addition & 1 deletion features/upgrade/build/build-upgrade.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Feature: build related upgrade check
| app_repo | openshift/ruby~https://github.com/openshift/ruby-ex |
Then the step should succeed
When I run the :new_app_as_dc client command with:
| app_repo | quay.io/openshifttest/ruby-27-centos7:centos7~https://github.com/openshift/ruby-hello-world |
| app_repo | quay.io/openshifttest/ruby-27:multiarch~https://github.com/openshift/ruby-hello-world |
| strategy | docker |
Then the step should succeed
Given I use the "build-upgrade" project
Expand Down
2 changes: 1 addition & 1 deletion testdata/build/application-template-dockerbuild.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
"dockerStrategy": {
"from": {
"kind": "DockerImage",
"name": "quay.io/openshifttest/ruby-27-centos7:centos7"
"name": "quay.io/openshifttest/ruby-27:multiarch"
},
"env": [
{
Expand Down
2 changes: 1 addition & 1 deletion testdata/build/ocp11224/test-buildconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"sourceStrategy": {
"from": {
"kind": "DockerImage",
"name": "quay.io/openshifttest/ruby-25-centos7@sha256:575194aa8be12ea066fc3f4aa9103dcb4291d43f9ee32e4afe34e0063051610b"
"name": "quay.io/openshifttest/ruby-27@sha256:cdb6a13032184468b1e0607f36cfb8834c97dbeffeeff800e9e6834323bed8fc"
}
},
"env": [
Expand Down
2 changes: 1 addition & 1 deletion testdata/build/ocp11474/test-buildconfig-s2i.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"sourceStrategy": {
"from": {
"kind": "DockerImage",
"name": "quay.io/openshifttest/ruby-25-centos7@sha256:575194aa8be12ea066fc3f4aa9103dcb4291d43f9ee32e4afe34e0063051610b"
"name": "quay.io/openshifttest/ruby-27@sha256:cdb6a13032184468b1e0607f36cfb8834c97dbeffeeff800e9e6834323bed8fc"
},
"pullSecret": {"name" : "pull"}
}
Expand Down
2 changes: 1 addition & 1 deletion testdata/build/ocp11550/test-buildconfig.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"sourceStrategy": {
"from": {
"kind": "DockerImage",
"name": "quay.io/openshifttest/ruby-25-centos7@sha256:575194aa8be12ea066fc3f4aa9103dcb4291d43f9ee32e4afe34e0063051610b"
"name": "quay.io/openshifttest/ruby-27@sha256:cdb6a13032184468b1e0607f36cfb8834c97dbeffeeff800e9e6834323bed8fc"
}
},
"env": [
Expand Down
2 changes: 1 addition & 1 deletion testdata/build/ruby20rhel7-invalidcontext-docker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
"dockerStrategy": {
"from": {
"kind": "DockerImage",
"name": "quay.io/openshifttest/ruby-25-centos7@sha256:575194aa8be12ea066fc3f4aa9103dcb4291d43f9ee32e4afe34e0063051610b"
"name": "quay.io/openshifttest/ruby-27@sha256:cdb6a13032184468b1e0607f36cfb8834c97dbeffeeff800e9e6834323bed8fc"
},
"env": [
{
Expand Down
2 changes: 1 addition & 1 deletion testdata/build/ruby22rhel7-template-docker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
"dockerStrategy": {
"from": {
"kind": "DockerImage",
"name": "quay.io/openshifttest/ruby-27-centos7:centos7"
"name": "quay.io/openshifttest/ruby-27:multiarch"
},
"env": [
{
Expand Down
2 changes: 1 addition & 1 deletion testdata/downwardapi/ocp10628/downward-example.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ metadata:
spec:
containers:
- name: test-container
image: quay.io/openshifttest/ruby-25-centos7@sha256:575194aa8be12ea066fc3f4aa9103dcb4291d43f9ee32e4afe34e0063051610b
image: quay.io/openshifttest/ruby-27@sha256:cdb6a13032184468b1e0607f36cfb8834c97dbeffeeff800e9e6834323bed8fc
command: [ "/bin/sh", "-c", "env" ]
env:
- name: POD_NAME
Expand Down
2 changes: 1 addition & 1 deletion testdata/templates/OCP-12057/application-template-stibuild_pull_private_sourceimage.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@
{
"from": {
"kind": "DockerImage",
"name": "quay.io/openshifttest/ruby-25-centos7@sha256:575194aa8be12ea066fc3f4aa9103dcb4291d43f9ee32e4afe34e0063051610b"
"name": "quay.io/openshifttest/ruby-27@sha256:cdb6a13032184468b1e0607f36cfb8834c97dbeffeeff800e9e6834323bed8fc"
},
"pullSecret": { "name": "pull" },
"paths": [
Expand Down
2 changes: 1 addition & 1 deletion testdata/templates/ocp11023/build.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ spec:
value: sample-app
from:
kind: DockerImage
name: quay.io/openshifttest/ruby-25-centos7@sha256:575194aa8be12ea066fc3f4aa9103dcb4291d43f9ee32e4afe34e0063051610b
name: quay.io/openshifttest/ruby-27@sha256:cdb6a13032184468b1e0607f36cfb8834c97dbeffeeff800e9e6834323bed8fc
type: Source
2 changes: 1 addition & 1 deletion testdata/templates/ocp11552/ruby22rhel7-template-docker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
"dockerStrategy": {
"from": {
"kind": "DockerImage",
"name": "quay.io/openshifttest/ruby-27-centos7:centos7"
"name": "quay.io/openshifttest/ruby-27:multiarch"
},
"env": [
{
Expand Down