search

CiscoDevNet / learning-labs-issues

Defects and bugs in learning lab content and project management
4 stars 0 forks source link

Updates rejected because remote contains changes that are not local - Git message needs note #264

Open njssli23 opened 4 years ago

njssli23 commented 4 years ago

The below lab requires internet access via the DevBox.

https://developer.cisco.com/learning/lab/cicd-intro/step/2

Unable to connect to anything off-net via DevBox.

Maybe the lab ID: be51af73-c9e9-4af7-89d2-42c1c71e1f09 Also maybe the lab ID: DevNet Sandbox Labs/CICD Pipeline/CICD Pipeline

Failing at step 2: ssh root@10.10.20.20 >>WORKED<< password is cisco123 >>WORKED<< _git clone https://github.com/CiscoDevNet/cicd_learninglab_demo.git_ >>FAILED<<

[developer@devbox ~]$ git clone https://github.com/CiscoDevNet/cicd_learninglab_demo.git Cloning into 'cicd_learninglab_demo'... fatal: unable to access 'https://github.com/CiscoDevNet/cicd_learninglab_demo.git/': Could not resolve host: github.com; Unknown error

[developer@devbox ~]$ ping github.com ping: github.com: Temporary failure in name resolution

[developer@devbox ~]$ cat /etc/resolv.conf Generated by NetworkManager search abc.inc nameserver 10.10.20.100 nameserver 10.17.248.12

[developer@devbox ~]$ ping 10.10.20.100 PING 10.10.20.100 (10.10.20.100) 56(84) bytes of data. 64 bytes from 10.10.20.100: icmp_seq=1 ttl=64 time=0.282 ms 64 bytes from 10.10.20.100: icmp_seq=2 ttl=64 time=0.291 ms 64 bytes from 10.10.20.100: icmp_seq=3 ttl=64 time=0.328 ms 64 bytes from 10.10.20.100: icmp_seq=4 ttl=64 time=0.351 ms ^C --- 10.10.20.100 ping statistics --- 4 packets transmitted, 4 received, 0% packet loss, time 2999ms rtt min/avg/max/mdev = 0.282/0.313/0.351/0.027 ms

[developer@devbox ~]$ ping 140.82.113.4 PING 140.82.113.4 (140.82.113.4) 56(84) bytes of data.

^C --- 140.82.113.4 ping statistics --- 86 packets transmitted, 0 received, 100% packet loss, time 85000ms

Thanks!

annegentle commented 4 years ago

Also related to https://github.com/CiscoDevNet/learning-labs-issues/issues/244

annegentle commented 4 years ago

Logged issue with the Sandbox team to request that the Git repo be copied to the DevBox image. Once that is completed we'll change the LL instructions to let people know that on the devbox the files are available, and if they're working locally, to use git clone ... commands.

njssli23 commented 4 years ago

Thank you 🙏

Sent from my iPhone

On Sep 11, 2020, at 4:32 PM, Anne Gentle notifications@github.com wrote:

 Logged issue with the Sandbox team to request that the Git repo be copied to the DevBox image. Once that is completed we'll change the LL instructions to let people know that on the devbox the files are available, and if they're working locally, to use git clone ... commands.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub, or unsubscribe.

annegentle commented 4 years ago

Tom has let me know this is on their backlog, no ETA yet. I'll continue to update the issue with updates for when he schedules the work.

njssli23 commented 4 years ago

Thank you for the update.

On Tue, Sep 22, 2020 at 9:35 AM Anne Gentle notifications@github.com wrote:

Tom has let me know this is on their backlog, no ETA yet. I'll continue to update the issue with updates for when he schedules the work.

— You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub https://github.com/CiscoDevNet/learning-labs-issues/issues/264#issuecomment-696725611, or unsubscribe https://github.com/notifications/unsubscribe-auth/AK4ZD2FCHMT2GXBDC6H5Z73SHCRYPANCNFSM4RHUBWTQ .

dethanga commented 4 years ago

@vvaliapa As informed, you are already handling this issue "#244" and other fixes for CICD Lab, I am assigning this to you. Kindly check.

annegentle commented 4 years ago

@vvaliapa Good news! I have this new update from the Sandbox team, so work can continue on this Issue. The Devbox IP address is now 10.10.20.50 and the username is developer. The repo is replicated to both the devbox and the gogs server in the Sandbox environment. In the devbox, the repo is located at /home/developer/Downloads/cicd_learninglab_demo, so the user could just cd Downloads/cicd_learninglab_demo. Also, you can write the instructions to use git clone http://10.10.20.24:3000/test/cicd_learninglab_demo.git to get the repo. You can update so that it would work either way.

vvaliapa commented 3 years ago

@vvaliapa Good news! I have this new update from the Sandbox team, so work can continue on this Issue. The Devbox IP address is now 10.10.20.50 and the username is developer. The repo is replicated to both the devbox and the gogs server in the Sandbox environment. In the devbox, the repo is located at /home/developer/Downloads/cicd_learninglab_demo, so the user could just cd Downloads/cicd_learninglab_demo. Also, you can write the instructions to use git clone http://10.10.20.24:3000/test/cicd_learninglab_demo.git to get the repo. You can update so that it would work either way.

Hi Anne, I have tested again with this update. I am getting this error.

gitpush error1
annegentle commented 3 years ago

I think that the way to keep the student moving forward is to add a note that the student can run git pull origin master because Git will merge the changes and the student can keep going.

vvaliapa commented 3 years ago

@annegentle, I tested the Lab again with this "git pull origin master", still getting the same error. Attaching the screenshot.

push-cicd-error1 push-cicd-error
annegentle commented 3 years ago

The fix for this is to update the Sandbox image so that it contains the latest code. Then the git pull origin master will match exactly. Who is the owner of this Sandbox? They can work with Bob to update the image.