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

Remove deprecated images and update tests #3587

Conversation

amitkrout
Copy link
Contributor

@amitkrout amitkrout commented Jul 16, 2020

What type of PR is this?
/kind cleanup
/kind deprecation
/kind documentation

What does does this PR do / why we need it:
Clean up
Which issue(s) this PR fixes:

Fixes need for redhat-developer/odo-init-image#64

PR acceptance criteria:

  • Unit test

  • Integration test : NA - Tests are running on all s2i images in e2e scenario.

  • Documentation

How to test changes / Special notes to the reviewer:
old unsupported images are removed

@openshift-ci-robot
Copy link
Collaborator

@amitkrout: The label(s) kind/deprecation cannot be applied, because the repository doesn't have them

In response to this:

What type of PR is this?
/kind cleanup
/kind deprecation
/kind documentation

What does does this PR do / why we need it:
Clean up
Which issue(s) this PR fixes:

Fixes need for redhat-developer/odo-init-image#64

PR acceptance criteria:

  • Unit test

  • Integration test

  • Documentation

How to test changes / Special notes to the reviewer:
old unsupported images are removed

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.


// older images which we should remove soon
"rhoar-nodejs/nodejs-8:latest",
"rhoar-nodejs/nodejs-10:latest",
Copy link
Contributor

Choose a reason for hiding this comment

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

this seems like a nodejs-10 image, should we remove this too?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Unfortunately i have removed it. Will add it back

"rhoar-nodejs/nodejs-8:latest",
"rhoar-nodejs/nodejs-10:latest",
"bucharestgold/centos7-s2i-nodejs:8.x",
"bucharestgold/centos7-s2i-nodejs:10.x",
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@mik-dass This image support has been removed in pr #3414, but unfortunately the reference is left behind in the catalog.go file

Copy link
Contributor

Choose a reason for hiding this comment

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

These are all deprecated images

@girishramnani
Copy link
Contributor

/approve

@openshift-ci-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: girishramnani

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel 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. Required by Prow. label Jul 16, 2020
@amitkrout amitkrout force-pushed the removeDeprecatedNodejs8Images branch 2 times, most recently from aea86ab to 0989465 Compare July 21, 2020 03:01
@@ -315,6 +314,7 @@ func MockImageStream() *imagev1.ImageStream {
"12": "docker.io/rhscl/nodejs-12-rhel7:latest",
"10": "docker.io/rhscl/nodejs-10-rhel7:latest",
"8": "docker.io/rhoar-nodejs/nodejs-8:latest",

// an unspported one
Copy link
Contributor

@prietyc123 prietyc123 Jul 21, 2020

Choose a reason for hiding this comment

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

AFAIU "8": and "6": both are unsupported one then why not shift this comment one step up

@prietyc123
Copy link
Contributor

Everything looks good to me 👍

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. Required by Prow. label Jul 21, 2020
@openshift-bot
Copy link

/retest

Please review the full test history for this PR and help us cut down flakes.

@amitkrout
Copy link
Contributor Author

amitkrout commented Jul 21, 2020

We have a genuine travis failure https://travis-ci.com/github/openshift/odo/jobs/363165202#L574
/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. Required by Prow. label Jul 21, 2020
@codecov
Copy link

codecov bot commented Jul 21, 2020

Codecov Report

Merging #3587 into master will decrease coverage by 0.03%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3587      +/-   ##
==========================================
- Coverage   45.73%   45.69%   -0.04%     
==========================================
  Files         122      122              
  Lines       12237    12230       -7     
==========================================
- Hits         5596     5589       -7     
  Misses       6090     6090              
  Partials      551      551              
Impacted Files Coverage Δ
pkg/catalog/catalog.go 53.74% <ø> (-1.04%) ⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update cb129c8...723c99d. Read the comment docs.

@amitkrout amitkrout force-pushed the removeDeprecatedNodejs8Images branch from 1a7a256 to 306ec7d Compare July 22, 2020 07:03
@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. Required by Prow. label Jul 22, 2020
@amitkrout amitkrout force-pushed the removeDeprecatedNodejs8Images branch 3 times, most recently from fefe5ad to 1c30cbc Compare July 24, 2020 14:47
@amitkrout amitkrout force-pushed the removeDeprecatedNodejs8Images branch from b08528c to 4a331d2 Compare July 25, 2020 06:31
// an unspported one
"8": "docker.io/rhoar-nodejs/nodejs-8:latest",
"6": "docker.io/rhoar-nodejs/nodejs-6:latest",
Copy link
Contributor

Choose a reason for hiding this comment

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

Why not remove nodejs-6 image as well?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Kept it here just for UTs validation step on more values.

Validation done here - https://github.com/openshift/odo/pull/3587/files#diff-1dfbb1796e8d3ca31e26fe9d003bb488R168

Copy link
Contributor

Choose a reason for hiding this comment

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

oh. my bad

@@ -583,6 +583,12 @@ func componentTests(args ...string) {
output := helper.CmdShouldPass("odo", append(args, "create", "nodejs:latest", componentName, "--app", appName, "--project", project, "--context", context)...)
Expect(output).NotTo(ContainSubstring("Warning"))
})

Copy link
Contributor

Choose a reason for hiding this comment

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

if there is java specific code involved as well, you should change the PR description. I see the supported-java.json file being added as well. will be a good practice.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Make sense 👍

I could have split it into two prs but currently it is well organized so i don't want to split again. Yes, i will update the pr title.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done

@amitkrout amitkrout changed the title Remove deprecated nodejs 8 images Remove deprecated images and update tests Jul 25, 2020
@amitkrout
Copy link
Contributor Author

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. Required by Prow. label Jul 25, 2020
@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. Required by Prow. label Jul 26, 2020
@openshift-merge-robot openshift-merge-robot merged commit b3cf595 into redhat-developer:master Jul 27, 2020
cdrage pushed a commit to cdrage/odo that referenced this pull request Jul 30, 2020
* Remove deprecated nodejs 8 images

* Update README

* Updated README

* Addressed review comments

* Fixing unit test failure

* Addressed review comment

* Fixing travis failure

* Checking oc version

* Applying supported image imagestream

* Applying supported image imagestream

* Added supported is

* Debugging

* Cleanup

* Updated test doc

* Cleanup
@rm3l rm3l added the area/refactoring Issues or PRs related to code refactoring label Jun 16, 2023
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. Required by Prow. area/refactoring Issues or PRs related to code refactoring lgtm Indicates that a PR is ready to be merged. Required by Prow.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants