diff options
| -rw-r--r-- | jjb/ci-AGL-verify/ci-platform-jjb.yaml | 10 | ||||
| -rw-r--r-- | packer/provision/agl_dependencies.sh | 2 | ||||
| -rw-r--r-- | packer/provision/basebuild.sh | 2 | ||||
| -rw-r--r-- | packer/provision/baseline.sh | 3 | ||||
| -rwxr-xr-x | packer/start_local_packer.sh | 13 |
5 files changed, 19 insertions, 11 deletions
diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml index 375dc55d..24841a5b 100644 --- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml +++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml @@ -5,7 +5,7 @@ #- bbe - h3ulcb-nogfx - qemux86-64 - - qemuarm + #- qemuarm - qemuarm64 - raspberrypi4 - raspberrypi5 @@ -123,10 +123,10 @@ # current-parameters: true # abort-all-job: false # kill-phase-on: NEVER - - name: 'ci-platform-{project}-verify-CIB-qemuarm' - current-parameters: true - #abort-all-job: true - kill-phase-on: FAILURE + #- name: 'ci-platform-{project}-verify-CIB-qemuarm' + # current-parameters: true + # #abort-all-job: true + # kill-phase-on: FAILURE - name: 'ci-platform-{project}-verify-CIB-qemuarm64' current-parameters: true #abort-all-job: true diff --git a/packer/provision/agl_dependencies.sh b/packer/provision/agl_dependencies.sh index ab0cb7bf..d8f17fb4 100644 --- a/packer/provision/agl_dependencies.sh +++ b/packer/provision/agl_dependencies.sh @@ -146,6 +146,8 @@ mkdir /w cp -r /home/ubuntu/.ssh/authorized_keys /home/jenkins/.ssh/authorized_keys echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQD0EqO61Im8/zCKj4Hg/H26Q3Z4UAjlIePVVu54LfbCIJ7wPLNTBBXBz74cTuiUMF8CbeBwOyWR83NELbSllKnr+wK6pv3h6f7Zn54sQBXjIy11K38CdrMdXxaCIIPBGqJvOy2JukdKuuwfTuXjUk57evoXKJH1aw3Vu3+81gvqCdKlzbWlOP1p0MdvsWVRpOMn27IH2Gz4/nDdwWtIF8YFHAIbWmlCZGiv8/i/nyuLfsC7p6p00qHfxO5KFTsstQe+/f8WkGNaY/Vz124PBic51GsJ+2SfEnDvYSaQvjsf+xPsfQ4Bo6xkz75sN3PYuNOGZX2TQom139b2x18XXzgwSzeZwYhPKN511xBFll5/0/SugWWU+7pNtXUrK+1PZ7zshlch/vaIJzeZCYYRim0yUDM6rLiJ/zqMRO5jvPqpnFjZ9Rz+bqPpLC3mMiEWBdbs9Hxtx3+NhrFVBGlDVoi7sBzDKyrSnuljAZHLaT9rxQquhWLKRUjPZviSb8s544WaQmWDyOTWkPXdN63pVM23EAfi1wVRIyPcLZMdoHQohbh+ePclG2pGfV8hro+aDNyvLcXj1wL8p43elV4d/jPjsePqso7IhyPSghhLCO7lLnrlNVBaI5A+/iUILRHU3LlmKJlErwDmkl1XAJbO0DHDpSwsIDrK1q9Eb7e+C6M8Ww==" >> /home/jenkins/.ssh/authorized_keys +echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDFPlD8r/AP4CJMwaaiBufxWYBL+H4t2Q7c7uRsFgrRZTPWILayNlUbz2SnJMOGw9/Fxj6pO5DudiV0qp/D9mSb5Ai1u3Fd0Ev7cUKGZ3UlnvLQX6N/42GpshmPbLMEj8GxRK7YgS9B8XgsPZALsoFBTv2PE7984tRO8SOq2Ijh13Vxfh9sz6rPm3sJZJ8zyFOnpBbEPcmN/OkbRQEwcMt1JXw/iEHvo9/pAUHBD9ZF4dAzAym3AqjxwkNy6oFsebdl3Czi41GLX+wj389gAW+YmT5MpHQae4aKkfc+3LkpXY5Od43lOBmBpXWMDV4JxL5Am4BiXQHkRuHr/4a3Q7TEKSpeUmcKusJR4j8hkIwxgqBYLwhJic5GkMrsu+223IH42M+yKXlzij9WBl8YIh1l+lma9ogQknMhb+2yJjiY2eeLAnF31NSA8EiHDQRwvbJBsC4d5RyCFpV3Kd9wX2UzpMfqRIQD7qFDOZzmSGjhLX9jpsQYHhobc/iK//Cy300= dl9pf@legolas" >> /home/jenkins/.ssh/authorized_keys +echo "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDxIHhWB+wX7j7n3tXH4jfBF0kmPZtjzuudp3jsRTNz1ddL9A6CH6GH+aP+9ps7/y8KQrxzU169b9mDHFM9Wq6hetfFEjJk+4JJLPlHWwznSzDIDz0nTkH9Yp8LvTCjIz1mg9PZsZTM47zxmthhdmVegBbQDEDNBWwdUHiziDF9/4EmDYn+//U9CU8vCuVqM4atnHVtCA+2iVkavvXiEfL75SHmqsB4psRQ1mZOWJkGefJXbh2gkEuuhEno1XW3Txc3Gt/hmzVR4h+2iBuxVcCEFNaKqJhbDOn5nG50rFuZj6gkRbtVnV6XKXI4AznPTuWhPtDTmsBHSAuLx/EiWho69L0Gh3adaSD0o0IvcgzN2m9fmKMLKmDKAlLGVhxZhqIFRiTshw0lTjdrk59TTTXDh6cA4hQ2c20bknXgjdegc0W2ef9fiTFfLKmY5rD2RFvKdGBWlGH8WVU86QzcZeyvFGGHtZ9AgSmIyDpWFwjcCXmxl1okGeBF2pJUovp0SEU= dl9pf@elrond" >> /home/jenkins/.ssh/authorized_keys chmod 0600 /home/jenkins/.ssh/authorized_keys # Generate ssh key for use by Robot jobs diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh index 08651d16..18e6e1d5 100644 --- a/packer/provision/basebuild.sh +++ b/packer/provision/basebuild.sh @@ -10,4 +10,6 @@ cat <<EOFSTAB >> /etc/fstab # tmp should be tmpfs so gcc tmpfiles do not hit the disk none /tmp tmpfs defaults 0 0 +10.30.73.73:/srv/tank /mnt/tank nfs4 auto,x-systemd.automount,async,rsize=8192,wsize=8192,sec=sys 0 0 + EOFSTAB diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh index 6854d527..12b3b9a6 100644 --- a/packer/provision/baseline.sh +++ b/packer/provision/baseline.sh @@ -129,6 +129,9 @@ EOF echo "---> Configuring OpenJDK" apt-get install -y default-jre-headless default-jdk-headless unzip + # install NFS + apt-get install -y nfs-common + } all_systems() { diff --git a/packer/start_local_packer.sh b/packer/start_local_packer.sh index 20e3ef22..e56a628c 100755 --- a/packer/start_local_packer.sh +++ b/packer/start_local_packer.sh @@ -1,11 +1,12 @@ #!/bin/bash - +set -x # -echo "Run: dpkg-reconfigure openssh-server" -echo "Fixup /etc/ssh/sshd_config" -echo "Run: ssh -R HOST:2222:localhost:22 user@10.0.2.2" -echo "Then connect to HOST:2222 with ssh" +#echo "Run: dpkg-reconfigure openssh-server" +#echo "Fixup /etc/ssh/sshd_config" +#echo "Run: ssh -R HOST:2222:localhost:22 user@10.0.2.2" +#echo "Then connect to HOST:2222 with ssh" -qemu-system-x86_64 -vnc :0 -hda output_ubuntu/jenkins-new-test -net nic -net user -serial stdio -accel kvm -smp 2 -m 4096
\ No newline at end of file +#qemu-system-x86_64 -hda output_ubuntu/jenkins-new-test -net nic -net user,hostfwd=tcp:127.0.0.1:60022-:22 -accel kvm -smp 4 -m 8192 -nographic +qemu-system-x86_64 -hda output_ubuntu/jenkins-new-test.raw -hdb output_ubuntu/file.img -net nic -net user,hostfwd=tcp:127.0.0.1:60022-:22 -accel kvm -smp 24 -m 32768 -nographic |