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

Add image-streams and update db-templates #17922

Merged
merged 1 commit into from
Jan 16, 2018

Conversation

pvalena
Copy link
Contributor

@pvalena pvalena commented Dec 22, 2017

for corresponding SCL containers.

I'll add image-streams for rhel7 and template updates in separate PRs.

source: https://github.com/sclorg/image-streams
CC: @hhorak

@openshift-ci-robot openshift-ci-robot added needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 22, 2017
@hhorak
Copy link
Contributor

hhorak commented Dec 22, 2017

@sspeiche @bparees FYI, any feedback welcome.

@bparees
Copy link
Contributor

bparees commented Dec 24, 2017

you'll need to run hack/update-generated-bindata.sh and include that updated file w/ your pr.

I assume all these new versions of images work w/ the existing sample apps they reference?

@bparees bparees self-assigned this Dec 24, 2017
@bparees
Copy link
Contributor

bparees commented Dec 24, 2017

/ok-to-test

@openshift-ci-robot openshift-ci-robot removed the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Dec 24, 2017
@pvalena
Copy link
Contributor Author

pvalena commented Jan 2, 2018

@bparees, images are tested with in their respective container repos, including templates and sample apps.
f.e.: https://github.com/sclorg/mariadb-container/blob/master/test/run-openshift

If it looks ok to you, I'll update the PR later this week to include all changes in this PR (RHEL, bindata, templates).

@bparees
Copy link
Contributor

bparees commented Jan 2, 2018

@pvalena it looks fine to me, just tag me again when it's updated w/ the other content and i'll merge it.

@sspeiche
Copy link
Contributor

sspeiche commented Jan 3, 2018

@pvalena @hhorak looks fine to me, please update so we can get this in!

@openshift-ci-robot openshift-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 5, 2018
@pvalena
Copy link
Contributor Author

pvalena commented Jan 5, 2018

@bparees, PTAL.

I've not added any new templates and I also did not update quickstarts (nginx image-streams were added).

@pvalena pvalena changed the title Add new image-streams for centos7 Add image-streams and update db-templates Jan 5, 2018
@pvalena
Copy link
Contributor Author

pvalena commented Jan 5, 2018

I've also cross-checked the changes for centos7 and rhel7 image-streams and they're the same.

"template.openshift.io/long-description": "This template provides a standalone MariaDB server with a database created. The database is not stored on persistent storage, so any restart of the service will result in all data being lost. The database name, username, and password are chosen via parameters when provisioning this service.",
"template.openshift.io/provider-display-name": "Red Hat, Inc.",
"template.openshift.io/documentation-url": "https://github.com/sclorg/mariadb-container/blob/master/10.2/root/usr/share/container-scripts/mysql/README.md",
"template.openshift.io/support-url": "https://access.redhat.com"
Copy link
Contributor

Choose a reason for hiding this comment

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

what was the reasoning for adding the "template" prefix here? I don't believe it is correct:

https://github.com/openshift/origin/blob/master/pkg/api/constants.go

Copy link
Contributor Author

@pvalena pvalena Jan 5, 2018

Choose a reason for hiding this comment

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

This had to be just copied from somewhere from origin/....
Sorry, we do not really know how those work. I'll fix it.
Thanks for checking!

pvalena added a commit to pvalena/mariadb-container that referenced this pull request Jan 5, 2018
pvalena added a commit to pvalena/mongodb-container that referenced this pull request Jan 5, 2018
pvalena added a commit to pvalena/mysql-container that referenced this pull request Jan 5, 2018
pvalena added a commit to pvalena/postgresql-container that referenced this pull request Jan 5, 2018
pvalena added a commit to pvalena/redis-container that referenced this pull request Jan 5, 2018
pvalena added a commit to pvalena/s2i-perl-container that referenced this pull request Jan 5, 2018
pvalena added a commit to sclorg/nginx-ex that referenced this pull request Jan 5, 2018
pvalena added a commit to sclorg/origin that referenced this pull request Jan 11, 2018
Add new image-streams for centos7 and rhel7.
 - source: https://github.com/sclorg/image-streams

Update db-templates/* to new version of corresponding container image.

Add nginx to quickstarts/* and run `hack/update-external-examples.sh`.

Update bindata.

Add and fix tests.

nginx -> docker.io/library/wordpress change:
openshift#17922 (comment)
@pvalena
Copy link
Contributor Author

pvalena commented Jan 11, 2018

Squashed.

@pvalena
Copy link
Contributor Author

pvalena commented Jan 12, 2018

@bparees, what do those timeouts mean?
s: "timed out waiting for the condition",

@bparees
Copy link
Contributor

bparees commented Jan 12, 2018

@bparees, what do those timeouts mean?
s: "timed out waiting for the condition",

we're waiting for the mongodb image import to complete and it's never going to because the mongodb image isn't available on dockerhub yet.

@pvalena
Copy link
Contributor Author

pvalena commented Jan 12, 2018

AFAICT the mongodb image available for some time now (I've tested it at 11:11 UTC+0).

@bparees
Copy link
Contributor

bparees commented Jan 12, 2018

/retest

@bparees
Copy link
Contributor

bparees commented Jan 12, 2018

@pvalena your latest failure:

test/cmd/newapp.sh:317: executing 'oc new-app --search --image-stream=nginx' expecting success and text 'Tags:\s+1.8, 1.10, 1.12, latest'
FAILURE after 0.437s: test/cmd/newapp.sh:317: executing 'oc new-app --search --image-stream=nginx' expecting success and text 'Tags:\s+1.8, 1.10, 1.12, latest': the output content test failed
Standard output from the command:
Image streams (oc new-app --image-stream=<image-stream> [--code=<source>])
-----
nginx
  Project: cmd-newapp
  Tags:    1.10, 1.12, 1.8, latest

looks like you just need to reorder the expected text.

pvalena added a commit to sclorg/origin that referenced this pull request Jan 15, 2018
Add new image-streams for centos7 and rhel7.
 - source: https://github.com/sclorg/image-streams

Update db-templates/* to new version of corresponding container image.

Add nginx to quickstarts/* and run `hack/update-external-examples.sh`.

Update bindata.

Add and fix tests.

nginx -> docker.io/library/wordpress change:
openshift#17922 (comment)
pvalena added a commit to pvalena/mongodb-container that referenced this pull request Jan 15, 2018
pvalena added a commit to pvalena/mongodb-container that referenced this pull request Jan 15, 2018
@bparees
Copy link
Contributor

bparees commented Jan 15, 2018

@pvalena

test/cmd/newapp.sh:321: executing 'oc new-app --search --image-stream=postgresql' expecting success and text 'Tags:\s+9.4, 9.5, latest'
FAILURE after 0.339s: test/cmd/newapp.sh:321: executing 'oc new-app --search --image-stream=postgresql' expecting success and text 'Tags:\s+9.4, 9.5, latest': the output content test failed
Standard output from the command:
Image streams (oc new-app --image-stream=<image-stream> [--code=<source>])
-----
postgresql
  Project: cmd-newapp
  Tags:    9.4, 9.5, 9.6, latest

Add new image-streams for centos7 and rhel7.
 - source: https://github.com/sclorg/image-streams

Update db-templates/* to new version of corresponding container image.

Add nginx to quickstarts/* and run `hack/update-external-examples.sh`.

Update bindata.

Add and fix tests.

nginx -> docker.io/library/wordpress change:
openshift#17922 (comment)
@pvalena
Copy link
Contributor Author

pvalena commented Jan 16, 2018

@bparees, that seems to be all, apart from the timeouts.

omron93 pushed a commit to sclorg/mongodb-container that referenced this pull request Jan 16, 2018
* Replace 'template.openshift.io' with 'openshift.io'

openshift/origin#17922 (review)

* Remove ' (Persistent)'

openshift/origin#17922 (review)
@bparees
Copy link
Contributor

bparees commented Jan 16, 2018

@pvalena since you changed the readiness probes, I suspect the timeouts are due to your changes. Have you tested those template changes elsewhere?

@pvalena
Copy link
Contributor Author

pvalena commented Jan 16, 2018

Have you tested those template changes elsewhere?

@bparees , yes. All changes should be properly tested in their respective container-image repositories.
F.e. for postgresql in this PR, running this command,
which translates simply to oc process ... |create -f -.
Do you have more specifics on what failed?

@bparees
Copy link
Contributor

bparees commented Jan 16, 2018

I ran the tests locally w/ your commit and verified they pass.

/lgtm
/retest

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Jan 16, 2018
@openshift-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees, pvalena

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 16, 2018
bparees pushed a commit to bparees/origin that referenced this pull request Jan 16, 2018
Add new image-streams for centos7 and rhel7.
 - source: https://github.com/sclorg/image-streams

Update db-templates/* to new version of corresponding container image.

Add nginx to quickstarts/* and run `hack/update-external-examples.sh`.

Update bindata.

Add and fix tests.

nginx -> docker.io/library/wordpress change:
openshift#17922 (comment)
@bparees
Copy link
Contributor

bparees commented Jan 16, 2018

/retest

@openshift-ci-robot
Copy link

@pvalena: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/openshift-jenkins/extended_image_ecosystem 9d12ad6 link /test extended_image_ecosystem

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue (batch tested with PRs 17976, 17195, 18093, 18080, 17922).

@openshift-merge-robot openshift-merge-robot merged commit b8f3833 into openshift:master Jan 16, 2018
@pvalena pvalena deleted the image-streams branch January 17, 2018 11:55
@pvalena
Copy link
Contributor Author

pvalena commented Jan 17, 2018

Thanks!

kzon pushed a commit to kzon/taskor that referenced this pull request Apr 15, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants