Add Support for specifying git branch and tag in devfile #4260

adisky · 2020-11-26T12:16:48Z

What type of PR is this?

/kind feature

What does does this PR do / why we need it:
Updates go-git library
Users can specify git branch and git tag using checkoutFrom in devfile, This PR implements the same

starterProjects:
  - name: odo
    git:
      remotes:
        origin: https://github.com/openshift/odo
      checkoutFrom:
        revision: v2.0.0
        remote: origin

Which issue(s) this PR fixes:

Fixes #4257

PR acceptance criteria:

Unit test
Integration test
Documentation
I have read the test guidelines

How to test changes / Special notes to the reviewer:
Specify revision as shown above in devfile, revision could be a tag or branch. odo should download the starter project from specified branch/tag

adisky · 2020-11-26T12:18:27Z

Need to write tests

Fix Integration test

adisky · 2020-12-01T09:47:54Z

/retest

Does not seemed to be linked error with the PR.

 When linking devfile component with Operator backed service
  /go/src/github.com/openshift/odo/tests/integration/operatorhub/cmd_service_test.go:360
    should successfully connect and disconnect a component with an existing service [It]
    /go/src/github.com/openshift/odo/tests/integration/operatorhub/cmd_service_test.go:410
    No future change is possible.  Bailing out early after 300.515s.
      
    Running odo with args [odo push]
    Expected
        <int>: 1
    to match exit code:
        <int>: 0
    /go/src/github.com/openshift/odo/tests/helper/helper_run.go:34
------------------------------

dharmit · 2020-12-01T09:53:02Z

Does not seemed to be linked error with the PR.

 When linking devfile component with Operator backed service
  /go/src/github.com/openshift/odo/tests/integration/operatorhub/cmd_service_test.go:360
    should successfully connect and disconnect a component with an existing service [It]
    /go/src/github.com/openshift/odo/tests/integration/operatorhub/cmd_service_test.go:410
    No future change is possible.  Bailing out early after 300.515s.
      
    Running odo with args [odo push]
    Expected
        <int>: 1
    to match exit code:
        <int>: 0
    /go/src/github.com/openshift/odo/tests/helper/helper_run.go:34
------------------------------

The reason for failure shows before the summary of failure. Here are the relevant logs:

 [odo] I1201 07:54:17.997656   69701 deployments.go:139] Waiting for deployment "xpcvfl" rollout to finish: 0 of 1 updated replicas are available...
[odo] I1201 07:54:17.997662   69701 deployments.go:146] Waiting for deployment spec update to be observed...
[odo]  ✗  Waiting for component to start [5m]
[odo]  ✗  Failed to start component with name xpcvfl. Error: Failed to create the component: error while waiting for deployment rollout: timeout while waiting for xpcvfl deployment roll out
Deleting project: khbtduaeqe
Running odo with args [odo project delete khbtduaeqe -f]
[odo] I1201 07:59:17.399962   69728 util.go:736] HTTPGetRequest: https://raw.githubusercontent.com/openshift/odo/master/build/VERSION
[odo] I1201 07:59:17.400252   69728 util.go:757] Response will be cached in /tmp/odohttpcache for 1h0m0s
[odo] I1201 07:59:17.592408   69728 util.go:770] Cached response used.
[odo]  ⚠  Warning! Projects are deleted from the cluster asynchronously. Odo does its best to delete the project. Due to multi-tenant clusters, the project may still exist on a different node.
[odo] I1201 07:59:17.684440   69728 odo.go:72] Could not get the latest release information in time. Never mind, exiting gracefully :)
[odo]  ✓  Deleted project : khbtduaeqe
Setting current dir to: /go/src/github.com/openshift/odo/tests/integration/operatorhub
Deleting dir: /tmp/689072515
------------------------------
• Failure [368.286 seconds]
odo service command tests for OperatorHub
/go/src/github.com/openshift/odo/tests/integration/operatorhub/cmd_service_test.go:17
  When linking devfile component with Operator backed service
  /go/src/github.com/openshift/odo/tests/integration/operatorhub/cmd_service_test.go:360
    should successfully connect and disconnect a component with an existing service [It]
[Fail] odo service command tests for OperatorHub When linking devfile component with Operator backed service [It] should successfully connect and disconnect a component with an existing service 
/go/src/github.com/openshift/odo/tests/helper/helper_run.go:34
Ran 15 of 15 Specs in 823.713 seconds
FAIL! -- 14 Passed | 1 Failed | 0 Pending | 0 Skipped
--- FAIL: TestOperatorhub (823.72s)
FAIL

We're hitting #3256 like in many other recent CI failures. 😢

Added Integration tests

adisky · 2020-12-02T07:53:42Z

/retest

level=error
level=error msg="Error: Error creating VPC: VpcLimitExceeded: The maximum number of VPCs has been reached."
level=error msg="\tstatus code: 400, request id: a8befd5a-4663-4987-864f-1f2b4d67c19c"
level=error
level=error msg="  on ../tmp/openshift-install-225736861/vpc/vpc.tf line 6, in resource \"aws_vpc\" \"new_vpc\":"
level=error msg="   6: resource \"aws_vpc\" \"new_vpc\" {"
level=error
level=error
level=fatal msg="failed to fetch Cluster: failed to generate asset \"Cluster\": failed to create cluster: failed to apply Terraform: failed to complete the change"
2020/12/02 07:31:55 Failed to upload $KUBECONFIG: timed out waiting for the condition: stat /tmp/secret/kubeconfig: no such file or directory
error: failed to execute wrapped command: exit status 1

dharmit · 2020-12-02T11:05:16Z

Need to write tests

Is this ready for review?

adisky · 2020-12-03T06:32:53Z

Is this ready for review?

yes

dharmit

Some trademark silly questions and some requests for adding more comments. Haven't tried checking the functionality yet.

pkg/odo/cli/component/create.go

dharmit · 2020-12-03T06:39:41Z

pkg/odo/cli/component/create.go

+		refName = plumbing.NewBranchReferenceName(revision)
+	}
+
+	downloadSpinner := log.Spinnerf("Downloading starter project %s from %s", starterProject.Name, remoteUrl)


Using %q would print better output. I know we don't follow this across our code. So leaving it up to you to decide if you want to do it or not.

pkg/odo/cli/component/create.go

openshift-merge-robot · 2020-12-03T09:44:19Z

@adisky: The following test failed, say /retest to rerun all failed tests:

Test name	Commit	Details	Rerun command
ci/prow/v4.5-integration-e2e	`85c504b`	link	`/test v4.5-integration-e2e`

Full PR test history. Your PR dashboard.

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.

tests/integration/devfile/cmd_devfile_create_test.go

dharmit · 2020-12-03T09:53:38Z

@adisky: The following tests failed, say /retest to rerun all failed tests:
Test name Commit Details Rerun command
ci/prow/v4.5-integration-e2e 85c504b link /test v4.5-integration-e2e
Full PR test history. Your PR dashboard.

/override ci/prow/v4.5-integration-e2e

openshift-ci-robot · 2020-12-03T09:53:39Z

@dharmit: /override requires a failed status context to operate on.
The following unknown contexts were given:

ci/prow/v4.5-integration-e2e

Only the following contexts were expected:

ci/prow/unit
ci/prow/v4.6-integration-e2e
tide

In response to this:

@adisky: The following tests failed, say /retest to rerun all failed tests:
Test name Commit Details Rerun command
ci/prow/v4.5-integration-e2e 85c504b link /test v4.5-integration-e2e
Full PR test history. Your PR dashboard.

/override ci/prow/v4.5-integration-e2e

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.

dharmit · 2020-12-07T12:18:42Z

@adisky I'm trying to check out the functionality and am facing a few issues. Maybe I'll ask a few embarrassing questions. First, I forked https://github.com/odo-devfiles/nodejs-ex repo and created a separate branch with minor changes. Here it is: dharmit/nodejs-ex@5d68d95.

Next, I built odo binary using your PR (well, obviously!)

Steps followed after that:

$ git clone repo
$ cd repo

$ odo create nodejs node

# next I modified the devfile and did `odo push`

On the URL, I see the message Hello from Node.js Starter Application! instead of the change I made. Here's the devfile:

devfile

commands:
- exec:
    commandLine: npm install
    component: runtime
    group:
      isDefault: true
      kind: build
    workingDir: /project
  id: install
- exec:
    commandLine: npm start
    component: runtime
    group:
      isDefault: true
      kind: run
    workingDir: /project
  id: run
- exec:
    commandLine: npm run debug
    component: runtime
    group:
      isDefault: true
      kind: debug
    workingDir: /project
  id: debug
- exec:
    commandLine: npm test
    component: runtime
    group:
      isDefault: true
      kind: test
    workingDir: /project
  id: test
components:
- container:
    endpoints:
    - name: http-3000
      targetPort: 3000
    - exposure: public
      name: node-3000
      path: /
      protocol: http
      targetPort: 3000
    image: registry.access.redhat.com/ubi8/nodejs-12:1-45
    memoryLimit: 1024Mi
    mountSources: true
    sourceMapping: /project
  name: runtime
metadata:
  name: nodejs
  version: 1.0.0
schemaVersion: 2.0.0
starterProjects:
- git:
    checkoutFrom:
      remote: origin
      revision: my-branch
    remotes:
      origin: https://github.com/dharmit/nodejs-ex.git
  name: nodejs-starter

What am I doing wrong?

adisky · 2020-12-07T12:36:20Z

devfile
What am I doing wrong?

This works when you download starter project with odo odo create nodejs --starter, you are cloning the project by yourself

dharmit

/approve

openshift-ci-robot · 2020-12-07T12:53:49Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adisky, dharmit

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:

~~OWNERS~~ [adisky,dharmit]

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

Aditi Sharma added 2 commits November 26, 2020 15:35

Update go-git

e9c294d

Add support for specifying branch and tag name

85c504b

openshift-ci-robot requested review from dharmit and mik-dass November 26, 2020 12:17

adisky changed the title ~~Add Support for specifying git branch and tag in devfile~~ [WIP] Add Support for specifying git branch and tag in devfile Nov 26, 2020

openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. Required by Prow. label Nov 26, 2020

Fix gosec error

51a4f4f

Fix Integration test

adisky force-pushed the fix-branch branch from 1f4fd9e to 51a4f4f Compare December 1, 2020 05:26

Added warning if commit id is used as revision

3c31843

Added Integration tests

adisky changed the title ~~[WIP] Add Support for specifying git branch and tag in devfile~~ Add Support for specifying git branch and tag in devfile Dec 2, 2020

openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. Required by Prow. label Dec 2, 2020

fix devfile

c7b4112

dharmit suggested changes Dec 3, 2020

View reviewed changes

openshift-ci-robot assigned dharmit Dec 3, 2020

adisky commented Dec 3, 2020

View reviewed changes

pkg/odo/cli/component/create.go Show resolved Hide resolved

adisky commented Dec 3, 2020

View reviewed changes

pkg/odo/cli/component/create.go Show resolved Hide resolved

adisky commented Dec 3, 2020

View reviewed changes

pkg/odo/cli/component/create.go Show resolved Hide resolved

dharmit reviewed Dec 3, 2020

View reviewed changes

tests/integration/devfile/cmd_devfile_create_test.go Outdated Show resolved Hide resolved

Fix failing test update tag version

4e3bb9b

adisky force-pushed the fix-branch branch from 6faa968 to 4e3bb9b Compare December 3, 2020 10:25

Address review comment 1

9607dcc

dharmit approved these changes Dec 7, 2020

View reviewed changes

openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. Required by Prow. label Dec 7, 2020

openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. Required by Prow. label Dec 7, 2020

openshift-merge-robot merged commit c194899 into redhat-developer:master Dec 7, 2020

anandrkskd mentioned this pull request Dec 16, 2020

Add periodic job stats jgwest/odo-tools#1

Closed

scottkurz mentioned this pull request Mar 1, 2022

Werror while downloading git starter project with "main" as a default branch #4555

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Support for specifying git branch and tag in devfile #4260

Add Support for specifying git branch and tag in devfile #4260

adisky commented Nov 26, 2020 •

edited

Loading

adisky commented Nov 26, 2020

adisky commented Dec 1, 2020

dharmit commented Dec 1, 2020

adisky commented Dec 2, 2020

dharmit commented Dec 2, 2020

adisky commented Dec 3, 2020 •

edited

Loading

dharmit left a comment

dharmit Dec 3, 2020

openshift-merge-robot commented Dec 3, 2020 •

edited

Loading

dharmit commented Dec 3, 2020

openshift-ci-robot commented Dec 3, 2020

dharmit commented Dec 7, 2020

adisky commented Dec 7, 2020

dharmit left a comment

openshift-ci-robot commented Dec 7, 2020

Add Support for specifying git branch and tag in devfile #4260

Add Support for specifying git branch and tag in devfile #4260

Conversation

adisky commented Nov 26, 2020 • edited Loading

adisky commented Nov 26, 2020

adisky commented Dec 1, 2020

dharmit commented Dec 1, 2020

adisky commented Dec 2, 2020

dharmit commented Dec 2, 2020

adisky commented Dec 3, 2020 • edited Loading

dharmit left a comment

Choose a reason for hiding this comment

dharmit Dec 3, 2020

Choose a reason for hiding this comment

openshift-merge-robot commented Dec 3, 2020 • edited Loading

dharmit commented Dec 3, 2020

openshift-ci-robot commented Dec 3, 2020

dharmit commented Dec 7, 2020

adisky commented Dec 7, 2020

dharmit left a comment

Choose a reason for hiding this comment

openshift-ci-robot commented Dec 7, 2020

adisky commented Nov 26, 2020 •

edited

Loading

adisky commented Dec 3, 2020 •

edited

Loading

openshift-merge-robot commented Dec 3, 2020 •

edited

Loading