I did the "git pull" right before the git review -s and git review. I pushed (git review) the original dcae test cases from the same directory, and no update since then until this one. This git is really problematic to use. I will clone a new copy of Integration project and copy over the update to see.
Thanks, Peter From: Gary Wu [mailto:[email protected]] Sent: Monday, September 25, 2017 4:37 PM To: WANG, SHAOBO <[email protected]> Cc: JI, LUSHENG <[email protected]>; '[email protected]' <[email protected]> Subject: [integration] RE: DCAE VES Collector CSIT Test Cases Hi Peter, You need to make sure that your change is made on top of the latest commit from the master branch. Usually this can be done by doing a "git pull" before you make your change. However, if your working directory already has other local commits, then this won't work. In that case, you'll probably need to do something like "git reset --hard origin" to completely remove your local commits (note that this will blow away all your local changes!). Thanks, Gary From: WANG, SHAOBO [mailto:[email protected]] Sent: Monday, September 25, 2017 2:26 PM To: Gary Wu <[email protected]<mailto:[email protected]>> Cc: JI, LUSHENG <[email protected]<mailto:[email protected]>> Subject: RE: DCAE VES Collector CSIT Test Cases Hi Gary, I got problem to push the updated codes. Lusheng suggested using the dcaegen2 to replace the previous dcae script directory name, and I made the corresponding changes but I cannot push for review. It failed with both git review and git push origin HEAD:refs/for/master. I did run "git review -s" before the "git review". I followed the same procesure as the first push (successful) but it failed this time. What's I had done wrong? Thanks, Peter ============================================================================= pswang@wave:~/onap/integration$ git review You are about to submit multiple commits. This is expected if you are submitting a commit that is dependent on one or more in-review commits. Otherwise you should consider squashing your changes into one commit before submitting. The outstanding commits are: ed33e2f (HEAD -> master) Merge branch 'master' of http://gerrit.onap.org/r/integration<https://urldefense.proofpoint.com/v2/url?u=http-3A__gerrit.onap.org_r_integration&d=DwMFAg&c=LFYZ-o9_HUMeMTSQicvjIg&r=cs-R84rVeF0J0fH6Jt6UPQ&m=cYqOEFvcCi3rKWNmLrA2TGCIjgF3PVZsQODpn8T7Yt8&s=d9mbUYhLaOxKuHlXsTojzzG04z8loXtprKNISO5xTgE&e=> c8d97ad Rename dcae to dcaegen2 to comfort Jenkins Do you really want to submit the above commits? Type 'yes' to confirm, other to cancel: yes remote: Processing changes: refs: 1, done To ssh://[email protected]:29418/integration.git ! [remote rejected] HEAD -> refs/publish/master (you are not allowed to upload merges) error: failed to push some refs to 'ssh://[email protected]:29418/integration.git' pswang@wave:~/onap/integration$ git push origin HEAD:refs/for/master Username for 'https://gerrit.onap.org':<https://urldefense.proofpoint.com/v2/url?u=https-3A__gerrit.onap.org-27-3A&d=DwQFAg&c=LFYZ-o9_HUMeMTSQicvjIg&r=cs-R84rVeF0J0fH6Jt6UPQ&m=cYqOEFvcCi3rKWNmLrA2TGCIjgF3PVZsQODpn8T7Yt8&s=AqKf4iNEBSxgIVvPDI1BtC1gLUAumEZOsK60UlClrLw&e=> pshaobow Password for 'https://[email protected]':<https://urldefense.proofpoint.com/v2/url?u=https-3A__pshaobow-40gerrit.onap.org-27-3A&d=DwQFAg&c=LFYZ-o9_HUMeMTSQicvjIg&r=cs-R84rVeF0J0fH6Jt6UPQ&m=cYqOEFvcCi3rKWNmLrA2TGCIjgF3PVZsQODpn8T7Yt8&s=K9NwY7owKIsv81gKV5k247S2XOLHAg3v0SueZWqvq2E&e=> Counting objects: 24, done. Delta compression using up to 4 threads. Compressing objects: 100% (21/21), done. Writing objects: 100% (24/24), 15.98 KiB | 0 bytes/s, done. Total 24 (delta 8), reused 0 (delta 0) remote: Resolving deltas: 100% (8/8) remote: Processing changes: refs: 1, done To http://[email protected]/r/integration<https://urldefense.proofpoint.com/v2/url?u=http-3A__pshaobow-40gerrit.onap.org_r_integration&d=DwMFAg&c=LFYZ-o9_HUMeMTSQicvjIg&r=cs-R84rVeF0J0fH6Jt6UPQ&m=cYqOEFvcCi3rKWNmLrA2TGCIjgF3PVZsQODpn8T7Yt8&s=NVLOLRzoPx-UpDtg5MrTM8DkR6rteO_XyYxpGKT4D90&e=> ! [remote rejected] HEAD -> refs/for/master (you are not allowed to upload merges) error: failed to push some refs to 'http://[email protected]/r/integration<https://urldefense.proofpoint.com/v2/url?u=http-3A__pshaobow-40gerrit.onap.org_r_integration&d=DwQFAg&c=LFYZ-o9_HUMeMTSQicvjIg&r=cs-R84rVeF0J0fH6Jt6UPQ&m=cYqOEFvcCi3rKWNmLrA2TGCIjgF3PVZsQODpn8T7Yt8&s=NVLOLRzoPx-UpDtg5MrTM8DkR6rteO_XyYxpGKT4D90&e=>' From: Gary Wu [mailto:[email protected]] Sent: Friday, September 22, 2017 5:28 PM To: WANG, SHAOBO <[email protected]<mailto:[email protected]>> Cc: HOTZE, BECKY L <[email protected]<mailto:[email protected]>> Subject: RE: DCAE VES Collector CSIT Test Cases Hi Peter, I don't have merge permissions on ci-management. It seems that Andy is asking that you fix the whitespace issue and resubmit the change. Thanks, Gary From: WANG, SHAOBO [mailto:[email protected]] Sent: Friday, September 22, 2017 3:18 PM To: Gary Wu <[email protected]<mailto:[email protected]>> Cc: HOTZE, BECKY L <[email protected]<mailto:[email protected]>> Subject: RE: DCAE VES Collector CSIT Test Cases Hi Gary, There is an extra space in the DCAEGEN2-CSIT Jenkins job template pushed this morning. It seems Andrew found the issue and removed the white space. Please confirm it and help move it to merge state. Thanks, Peter From: Gary Wu [mailto:[email protected]] Sent: Friday, September 22, 2017 9:51 AM To: WANG, SHAOBO <[email protected]<mailto:[email protected]>>; VENKATESH KUMAR, VIJAY <[email protected]<mailto:[email protected]>> Cc: HOTZE, BECKY L <[email protected]<mailto:[email protected]>>; JI, LUSHENG <[email protected]<mailto:[email protected]>>; '[email protected]' <[email protected]<mailto:[email protected]>> Subject: RE: DCAE VES Collector CSIT Test Cases The trigger jobs are specified if you want the completion of some other jobs (e.g. dcaegen2-master-docker-java-daily) to automatically trigger the execution of this one. Thanks, Gary From: WANG, SHAOBO [mailto:[email protected]] Sent: Friday, September 22, 2017 7:47 AM To: Gary Wu <[email protected]<mailto:[email protected]>>; VENKATESH KUMAR, VIJAY <[email protected]<mailto:[email protected]>> Cc: HOTZE, BECKY L <[email protected]<mailto:[email protected]>>; JI, LUSHENG <[email protected]<mailto:[email protected]>> Subject: RE: DCAE VES Collector CSIT Test Cases Hi Gary and Vijay, The Jenkins job are pushed for review, https://gerrit.onap.org/r/#/c/14637/<https://urldefense.proofpoint.com/v2/url?u=https-3A__gerrit.onap.org_r_-23_c_14637_&d=DwMFAg&c=LFYZ-o9_HUMeMTSQicvjIg&r=cs-R84rVeF0J0fH6Jt6UPQ&m=vU7wMSblfl_K-qNUgsRlbUEhbX6XHkIOIJp8tt_AF_U&s=rV-6XdBqTeLM-d1VWFMS3Q9-mZFsIWP2D4TL_hGuxdo&e=> . I am not sure the build and docker image build process so I am not sure the "Trigger" line (in red). Please advise it is wrong. - project: name: dcaegen2-csit jobs: - '{project-name}-{stream}-verify-csit-{functionality}' - '{project-name}-{stream}-csit-{functionality}' project-name: 'dcaegen2' stream: 'master' functionality: - 'testsuites': trigger_jobs: - 'dcaegen2-master-docker-java-daily' robot-options: '' branch: 'master' Thanks, Peter From: WANG, SHAOBO Sent: Friday, September 22, 2017 8:26 AM To: 'Gary Wu' <[email protected]<mailto:[email protected]>>; VENKATESH KUMAR, VIJAY <[email protected]<mailto:[email protected]>> Cc: HOTZE, BECKY L <[email protected]<mailto:[email protected]>>; JI, LUSHENG <[email protected]<mailto:[email protected]>> Subject: DCAE VES Collector CSIT Test Cases Hi Gary and Vijay, I pushed the DCAEGEN2 VES Collector test cases to gerrit repo, https://gerrit.onap.org/r/#/c/14427/<https://urldefense.proofpoint.com/v2/url?u=https-3A__gerrit.onap.org_r_-23_c_14427_&d=DwMFAg&c=LFYZ-o9_HUMeMTSQicvjIg&r=cs-R84rVeF0J0fH6Jt6UPQ&m=vU7wMSblfl_K-qNUgsRlbUEhbX6XHkIOIJp8tt_AF_U&s=f8QxHcw_jk4hzMOzCvEKuebBqPHfIuQJfsqSsSonaIs&e=>, last night. I added you two as Reviewers and please kindly help review and push to Master branch. I have run the test cases locally successful with CSIT environment. Please see the attached run traces. The test cases uses standard python packages. Just make sure uuid and jsonschema packages installed on Jenkins CSIT VM. I thought about to check the availability of the packages and installed them if needed, but the packages are standard libraries and may be used by the other areas so they should be global and be part of the system libraries. I will push the JJB dcaegen2-csit.yaml for adding a Jenkins job for the DCAEGEN2 CSIT. Please kindly review it as well. Thanks, Peter
_______________________________________________ onap-discuss mailing list [email protected] https://lists.onap.org/mailman/listinfo/onap-discuss
