diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index c2559f10501d5c5d003abe7d77333e00e391f23a..e73ecf7bb42da595c408c54ca34a38795e15661b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -38,7 +38,7 @@ compile-software: - make compile_all_code artifacts: paths: - - ./simulate/sim/*/*.hex + - ./nanosoc_tech/testcode/*/*.hex tags: - ds5 @@ -216,14 +216,14 @@ deploy-job-ZCU104: # This job runs in the deploy stage. - screen -r zynq -X stuff "./ZCU104_connect.sh\n" - sleep 10 # use scp to copy over bit files and python script - - screen -r zynq -X stuff "scp -i ~/.ssh/id_rsa dwn1c21@soclabs.soton.ac.uk:~/builds/wzndG1mA/0/soclabs/aes-128-project/nanosoc_tech/fpga/ci_tools/load_bitfile.py ./ \n" + - screen -r zynq -X stuff "scp -i ~/.ssh/id_rsa dwn1c21@soclabs.soton.ac.uk:~/builds/wzndG1mA/0/soclabs/accelerator-project/nanosoc_tech/fpga/ci_tools/* ./ \n" - sleep 2 - - screen -r zynq -X stuff "scp -i ~/.ssh/id_rsa dwn1c21@soclabs.soton.ac.uk:~/builds/wzndG1mA/0/soclabs/aes-128-project/imp/fpga/output/pynq_zcu104/overlays/nanosoc_design.* ./pynq/overlays/soclabs/ \n" + - screen -r zynq -X stuff "scp -i ~/.ssh/id_rsa dwn1c21@soclabs.soton.ac.uk:~/builds/wzndG1mA/0/soclabs/accelerator-project/imp/fpga/output/pynq_zcu104/overlays/nanosoc_design.* ./pynq/overlays/soclabs/ \n" - sleep 2 - - screen -r zynq -X stuff "scp -i ~/.ssh/id_rsa dwn1c21@soclabs.soton.ac.uk:~/builds/wzndG1mA/0/soclabs/aes-128-project/fpga_tests ./ \n" + - screen -r zynq -X stuff "scp -i ~/.ssh/id_rsa dwn1c21@soclabs.soton.ac.uk:~/builds/wzndG1mA/0/soclabs/accelerator-project/fpga_tests ./ \n" - sleep 2 - screen -r zynq -X stuff "mkdir binaries\n" - - screen -r zynq -X stuff "scp -i ~/.ssh/id_rsa dwn1c21@soclabs.soton.ac.uk:~/builds/wzndG1mA/0/soclabs/aes-128-project/nanosoc_tech/testcodes/*/*.hex ./binaries/ \n" + - screen -r zynq -X stuff "scp -i ~/.ssh/id_rsa dwn1c21@soclabs.soton.ac.uk:~/builds/wzndG1mA/0/soclabs/accelerator-project/nanosoc_tech/testcodes/*/*.hex ./binaries/ \n" - sleep 10 # Need root access to load the overlay onto the FPGA - screen -r zynq -X stuff "sudo su\n" @@ -237,7 +237,7 @@ deploy-job-ZCU104: # This job runs in the deploy stage. # script will output "Overlay Loaded" if successful - screen -r zynq -X stuff "python run_full_verification.py \n" - while ! grep -q "ALL TESTS FINISHED" screenlog; do sleep 10; done - - screen -r zynq -X stuff "scp -i ~/.ssh/id_rsa verification_log dwn1c21@soclabs.soton.ac.uk:~/builds/wzndG1mA/0/soclabs/aes-128-project/ \n" + - screen -r zynq -X stuff "scp -i ~/.ssh/id_rsa verification_log dwn1c21@soclabs.soton.ac.uk:~/builds/wzndG1mA/0/soclabs/accelerator-project/ \n" # deactivate the pynq virtual environment and exit root access - screen -r zynq -X stuff "deactivate \n" - screen -r zynq -X stuff "exit \n"