[LU-8737] Lustre upstream client tree for testing is wrong branch

• Type: Bug
• Resolution: Not a Bug
• Priority: Minor
• Environment: lustre staging tree that gerrit uses.
• Severity: 3
• Assignee: Minh Diep
• Reporter: James A Simmons

Description

Now that the upstream client is approaching the 2.8 version it is time to hook in testing setup to verify potential patches to land. When I went to check out the staging tree used for testing I noticed it is based on the wrong git tree. It needs to be based on the staging tree's staging-next branch.

Issue Links

• is related to: LU-7746 skip test of new functionality on upstream client

Comments

[James A Simmons]

From Doug's latest patch that was pushed it appears that the commit message issues has been fixed. Does checkpatch run against a submitted patch. Also it looks like the test suite is run against staging-testing branch which is correct. We are making progress.

[James A Simmons]

Yep Jenkins passed. Now for the checkpatch and commit message issue.

[Minh Diep]

I will look into the commit message being mangled; and checkpatch .

The jenkins build links should be accessible now

[James A Simmons]

Minh I noticed a few oddities with the pushed patch. The Intel-bug-id: url seems to have gotten mangled. The jenkins build links is also invalid. Lastly do you think it would be possible to get linux/scripts/checkpatch to run against the patch and report the result.

Thanks Peter

[Peter Jones]

Don't be so hard on yourself James

[James A Simmons]

You are right. I'm a idiot. I just pushed the patch. It works:

http://review.whamcloud.com/#/c/23382

[Minh Diep]

I would think you should use HEAD:refs/for/staging-testing to push for review; and which will trigger a build and test

[James A Simmons]

Ah I didn't know that you mirror several branches. So I did a checkout of the staging-testing branch. Its correct now.
Next step is to see if I can push a patch. When I push something now I see.

lustre-upstream$ git push ssh://[e-mail]:29418/fs/linux-staging HEAD:refs/heads/staging-testing
Enter passphrase for key '/ccs/home/jsimmons/.ssh/id_rsa':
Counting objects: 15, done.
Delta compression using up to 24 threads.
Compressing objects: 100% (8/8), done.
Writing objects: 100% (8/8), 953 bytes, done.
Total 8 (delta 7), reused 0 (delta 0)
remote: Resolving deltas: 100% (7/7)
remote: Counting objects: 8, done
remote: Branch refs/heads/staging-testing:
remote: You are not allowed to perform this operation.
remote: To push into this reference you need 'Push' rights.
remote: User: jsimmons
remote: Please read the documentation and contact an administrator
remote: if you feel the configuration is incorrect
remote: Processing changes: refs: 1, done
To ssh://[e-mail]:29418/fs/linux-staging
! [remote rejected] HEAD -> staging-testing (prohibited by Gerrit)
error: failed to push some refs to 'ssh://[e-mail]:29418/fs/linux-staging'

[Minh Diep]

Hi James,

These are what we mirrored

git remote add linux http://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
git remote add stable http://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git
git remote add staging http://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git

I compared staging.git/staging-testing and our mirrored fs/linux-testing/staging-testing; and they seem to match. am I missing something?

bddalton-mobl:staging minhdiep$ grep url .git/config
	url = http://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git
bddalton-mobl:staging minhdiep$ git lg | head
* 49b9137 - (HEAD, origin/staging-testing, origin/staging-next, staging-testing, staging-next) staging: greybus: audio: remove redundant slot field (25 hours ago)<Pankaj Bharadiya>
* 73270bb - Staging: Greybus: Fix trailing */ in block comments (25 hours ago)<Rahul Krishnan>
* 7fec2bc - staging: greybus: es2: fix arpc request size (25 hours ago)<Rui Miguel Silva>
* f9a21a3 - staging: greybus: audio_manager_sysfs: Replace sscanf with kstrto* to single variable conversion. (25 hours ago)<Elise Lennion>
* 5bc45c9d - staging: xgifb: Remove unnecessary parentheses. (25 hours ago)<Elise Lennion>
* 596f144 - staging: vt6656: Remove unnecessary parentheses. (25 hours ago)<Elise Lennion>
* a0f204a - Staging: android: ion: Make a read-only structure (25 hours ago)<Mihaela Muraru>
* 9fdd532 - staging: android: Remove unnecessary parentheses. (25 hours ago)<Elise Lennion>
* f9bee6d - staging: vc04_services: Add casts to remove warnings in vchiq_core.c (26 hours ago)<Michael Zoran>
* 8e8e2e3 - staging: vc04_services: Handle conversion from VCHIQ_SERVICE_HANDLE_T to VCHI_SERVICE_HANDLE_T (26 hours ago)<Michael Zoran>

hgyoo-mobl3:linux-staging minhdiep$ grep url .git/config
	url = ssh://[e-mail]:29418/fs/linux-staging
hgyoo-mobl3:linux-staging minhdiep$ git lg | head
* 49b9137 - (HEAD, origin/staging-testing, origin/staging-next, staging-testing, staging-next) staging: greybus: audio: remove redundant slot field (25 hours ago)<Pankaj Bharadiya>
* 73270bb - Staging: Greybus: Fix trailing */ in block comments (25 hours ago)<Rahul Krishnan>
* 7fec2bc - staging: greybus: es2: fix arpc request size (25 hours ago)<Rui Miguel Silva>
* f9a21a3 - staging: greybus: audio_manager_sysfs: Replace sscanf with kstrto* to single variable conversion. (25 hours ago)<Elise Lennion>
* 5bc45c9d - staging: xgifb: Remove unnecessary parentheses. (25 hours ago)<Elise Lennion>
* 596f144 - staging: vt6656: Remove unnecessary parentheses. (25 hours ago)<Elise Lennion>
* a0f204a - Staging: android: ion: Make a read-only structure (25 hours ago)<Mihaela Muraru>
* 9fdd532 - staging: android: Remove unnecessary parentheses. (25 hours ago)<Elise Lennion>
* f9bee6d - staging: vc04_services: Add casts to remove warnings in vchiq_core.c (26 hours ago)<Michael Zoran>
* 8e8e2e3 - staging: vc04_services: Handle conversion from VCHIQ_SERVICE_HANDLE_T to VCHI_SERVICE_HANDLE_T (26 hours ago)<Michael Zoran>
 

[James A Simmons]

I checked out:

ssh://[e-mail]:29418/fs/linux-staging

Is this the wrong thing that I checked out?

What is used for upstream lustre developement is:

git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git

Then switch to branch staging-testing