ipbus · alessandrothea · Jan 24, 2020 · Jan 16, 2020 · Jan 23, 2020 · Jan 16, 2020
diff --git a/boards/enclustra_ax3_pm3/sim/firmware/cfg/enclustra_ax3_pm3_sim.dep b/boards/enclustra_ax3_pm3/sim/firmware/cfg/enclustra_ax3_pm3_sim.dep
@@ -24,5 +24,5 @@
 #-------------------------------------------------------------------------------
 
 
-include -c boards/sim
+include -c boards/sim sim_udp.dep
 
diff --git a/boards/k800/synth/firmware/cfg/k800_infra_xdmaBypass.dep b/boards/k800/synth/firmware/cfg/k800_infra_xdmaBypass.dep
@@ -32,7 +32,7 @@
 
 
 src k800_infra.vhd
-src -c components/ipbus_util clocks_us_serdes.vhd ipbus_clock_div.vhd led_stretcher.vhd
+src -c components/ipbus_util clocks/clocks_us_serdes.vhd ipbus_clock_div.vhd led_stretcher.vhd
 include -c components/ipbus_pcie ipbus_pcie_xdmaBypass_us.dep
 include -c components/ipbus_transport_axi
 src -c components/ipbus_core ipbus_fabric_sel.vhd ipbus_package.vhd
diff --git a/boards/kcu105/basex/sim/firmware/cfg/kcu105_basex_sim.dep b/boards/kcu105/basex/sim/firmware/cfg/kcu105_basex_sim.dep
@@ -25,5 +25,5 @@
 
 
 include -c boards/kcu105/basex/synth ku040.dep
-include -c boards/sim
+include -c boards/sim sim_udp.dep
 
diff --git a/boards/pc053a/sim/firmware/cfg/pc053a_sim.dep b/boards/pc053a/sim/firmware/cfg/pc053a_sim.dep
@@ -25,5 +25,5 @@
 
 
 include -c boards/pc053a/synth a200.dep
-include -c boards/sim
+include -c boards/sim sim_udp.dep
 
diff --git a/boards/zcu102/basex/sim/firmware/cfg/zcu102_basex_sim.dep b/boards/zcu102/basex/sim/firmware/cfg/zcu102_basex_sim.dep
@@ -24,5 +24,5 @@
 #-------------------------------------------------------------------------------
 
 include -c boards/zcu102/basex/synth zu9.dep
-include -c boards/sim
+include -c boards/sim sim_udp.dep
 
diff --git a/ci/github-notifications.yml b/ci/github-notifications.yml
@@ -0,0 +1,40 @@
+
+.template_github_commit_status:
+  image: cern/cc7-base:20170113
+  tags:
+    - docker
+  only:
+    - branches
+    - web
+  dependencies: []
+
+github_commit_status:start:
+  extends: .template_github_commit_status
+  stage: initial_report
+  when: always
+  script:
+    - "curl -H \"Authorization: token ${GITHUB_API_TOKEN}\" --data '{\"state\" : \"pending\", \"target_url\" : \"'\"${CI_PROJECT_URL}\"'/pipelines/'\"${CI_PIPELINE_ID}\"'\", \"description\" : \"CI pipeline has started\", \"context\" : \"gitlab-ci-quick\"}' ${GITHUB_REPO_API_URL}/statuses/${CI_COMMIT_SHA}"
+    - "if [[ $CI_COMMIT_REF_NAME =~ ^pull-requests/[0-9]+$ ]]; then curl -H \"Authorization: token ${GITHUB_API_TOKEN}\" --data '{\"state\" : \"pending\", \"target_url\" : \"'\"${CI_PROJECT_URL}\"'/pipelines/'\"${CI_PIPELINE_ID}\"'\", \"description\" : \"CI pipeline has started\", \"context\" : \"gitlab-ci\"}' ${GITHUB_REPO_API_URL}/statuses/${CI_COMMIT_SHA} ; fi"
+
+github_commit_status:midway:success:
+  extends: .template_github_commit_status
+  stage: midway_report
+  when: on_success
+  script:
+    - "curl -H \"Authorization: token ${GITHUB_API_TOKEN}\" --data '{\"state\" : \"success\", \"target_url\" : \"'\"${CI_PROJECT_URL}\"'/pipelines/'\"${CI_PIPELINE_ID}\"'\", \"description\" : \"CI quick jobs completed successfully!\", \"context\" : \"gitlab-ci-quick\"}' ${GITHUB_REPO_API_URL}/statuses/${CI_COMMIT_SHA}"
+
+github_commit_status:end:failure:
+  extends: .template_github_commit_status
+  stage: final_report
+  when: on_failure
+  script:
+    - "curl -H \"Authorization: token ${GITHUB_API_TOKEN}\" --data '{\"state\" : \"failure\", \"target_url\" : \"'\"${CI_PROJECT_URL}\"'/pipelines/'\"${CI_PIPELINE_ID}\"'\", \"description\" : \"Jobs have failed in CI pipeline\", \"context\" : \"gitlab-ci\"}' ${GITHUB_REPO_API_URL}/statuses/${CI_COMMIT_SHA}"
+
+github_commit_status:end:success:
+  extends: .template_github_commit_status
+  stage: final_report
+  only:
+    - /^pull-requests.*$/
+  when: on_success
+  script:
+    - "curl -H \"Authorization: token ${GITHUB_API_TOKEN}\" --data '{\"state\" : \"success\", \"target_url\" : \"'\"${CI_PROJECT_URL}\"'/pipelines/'\"${CI_PIPELINE_ID}\"'\", \"description\" : \"CI pipeline completed successfully!\", \"context\" : \"gitlab-ci\"}' ${GITHUB_REPO_API_URL}/statuses/${CI_COMMIT_SHA}"
diff --git a/ci/publish.yml b/ci/publish.yml
@@ -0,0 +1,26 @@
+
+save_build_results:
+  stage: publish
+  image: gitlab-registry.cern.ch/ci-tools/ci-web-deployer:latest
+  only:
+    - /^pull-requests.[0-9]+$/
+    - master
+    - tags
+    - web
+  variables:
+    CI_OUTPUT_DIR: "build_results/"
+    OUTPUT_ROOT_DIR: "/eos/user/i/ipbusci/fw-gitlab-ci"
+  before_script:
+    - yum -y install openssh-clients
+    - export EOS_PATH=${OUTPUT_ROOT_DIR}/commits/${CI_COMMIT_TAG:-${CI_COMMIT_SHA}}/pipeline${CI_PIPELINE_ID}
+    - if [ -n "${CI_COMMIT_TAG}" ]; then export EOS_PATH=${EOS_PATH/commits/tags} ; fi
+  script:
+    - env | grep -v PASSWORD | grep -v TOKEN | sort
+    - echo "${EOS_ACCOUNT_PASSWORD}" | kinit ${EOS_ACCOUNT_USERNAME}@CERN.CH
+    - klist
+    - ssh -F ${CI_PROJECT_DIR}/ci/ssh_config ${EOS_ACCOUNT_USERNAME}@lxplus "rm -rf ${EOS_PATH} && mkdir -p ${EOS_PATH}"
+    - ssh -F ${CI_PROJECT_DIR}/ci/ssh_config ${EOS_ACCOUNT_USERNAME}@lxplus "ln -sfnv ${EOS_PATH} `dirname ${EOS_PATH}`/latest"
+    - kdestroy
+    - ls -l ${CI_OUTPUT_DIR} ${CI_OUTPUT_DIR}/*
+    - ls -l ${CI_OUTPUT_DIR}/*/*
+    - deploy-eos
diff --git a/ci/sim.yml b/ci/sim.yml
@@ -0,0 +1,95 @@
+
+run_sim_udp:vivado2018.3:modelsim10.6c:
+  extends: .template_base
+  image: ${IPBUS_DOCKER_REGISTRY}/ipbus-fw-dev-cc7:2019-04-30__ipbb0.5.0
+  tags:
+    - docker
+    - docker-cap-net-admin
+    - docker-device-net-tun
+    - xilinx-tools
+  stage: quick_checks
+  variables:
+    VIVADO_VERSION: "2018.3"
+    IPBB_SIMLIB_BASE: /scratch/xilinx-simlibs
+  script:
+    - export PATH=/software/mentor/modelsim_10.6c/modeltech/bin:$PATH
+    - export PATH=/opt/cactus/bin/uhal/tests:$PATH
+    - export LD_LIBRARY_PATH=/opt/cactus/lib:$LD_LIBRARY_PATH
+
+    - ipbb init work_area
+    - cd work_area
+    - ln -s ${CI_PROJECT_DIR} src/ipbus-firmware
+    - /${CI_PROJECT_DIR}/work_area/src/ipbus-firmware/tests/ci/test-run-sim-udp.sh sim
+
+
+run_sim:vivado2018.3:modelsim10.6c:
+  extends: .template_base
+  image: ${IPBUS_DOCKER_REGISTRY}/ipbus-fw-dev-cc7:2019-04-30__ipbb0.5.0
+  tags:
+    - docker
+    - docker-cap-net-admin
+    - docker-device-net-tun
+    - xilinx-tools
+  stage: quick_checks
+  variables:
+    VIVADO_VERSION: "2018.3"
+    IPBB_SIMLIB_BASE: /scratch/xilinx-simlibs
+  script:
+    - sudo openvpn --mktun --dev tap0
+    - sudo /sbin/ifconfig tap0 up 192.168.201.1
+    - sudo chmod a+rw /dev/net/tun
+    - export PATH=/software/mentor/modelsim_10.6c/modeltech/bin:$PATH
+
+    - ipbb init work_area
+    - cd work_area
+    - ln -s ${CI_PROJECT_DIR} src/ipbus-firmware
+    - /${CI_PROJECT_DIR}/work_area/src/ipbus-firmware/tests/ci/test-run-sim.sh sim
+
+
+run_ram_slaves_testbench_sim:vivado2018.3:modelsim10.6c:
+  extends: .template_base
+  image: ${IPBUS_DOCKER_REGISTRY}/ipbus-fw-dev-cc7:2019-04-30__ipbb0.5.0
+  tags:
+    - docker
+    - docker-cap-net-admin
+    - docker-device-net-tun
+    - xilinx-tools
+  stage: quick_checks
+  variables:
+    VIVADO_VERSION: "2018.3"
+    IPBB_SIMLIB_BASE: /scratch/xilinx-simlibs
+  script:
+    - sudo openvpn --mktun --dev tap0
+    - sudo /sbin/ifconfig tap0 up 192.168.201.1
+    - sudo chmod a+rw /dev/net/tun
+    - export PATH=/software/mentor/modelsim_10.6c/modeltech/bin:$PATH
+    - ipbb init work_area
+    - cd work_area
+    - ln -s ${CI_PROJECT_DIR} src/ipbus-firmware
+    - ipbb proj create sim ram_slvs_tb ipbus-firmware:tests/ram_slaves -t top_sim.dep
+    - cd proj/ram_slvs_tb
+    - ipbb sim setup-simlib
+    - ipbb sim ipcores
+    - ipbb sim fli
+    - ipbb sim make-project
+    - ./vsim -c work.top -gIP_ADDR='X"c0a8c902"' -do 'run 1ms' -do 'quit'
+
+
+run_ctr_slaves_testbench_sim:vivado2018.3:modelsim10.6c:
+  extends: .template_base
+  image: ${IPBUS_DOCKER_REGISTRY}/ipbus-fw-dev-cc7:2019-04-30__ipbb0.5.0
+  tags:
+    - docker
+    - xilinx-tools
+  stage: quick_checks
+  variables:
+    VIVADO_VERSION: "2018.3"
+    IPBB_SIMLIB_BASE: /scratch/xilinx-simlibs
+  script:
+    - export PATH=/software/mentor/modelsim_10.6c/modeltech/bin:$PATH
+    - export LD_LIBRARY_PATH=/opt/cactus/lib:$LD_LIBRARY_PATH
+
+    - ipbb init work_area
+    - cd work_area
+    - ln -s ${CI_PROJECT_DIR} src/ipbus-firmware
+    - /${CI_PROJECT_DIR}/work_area/src/ipbus-firmware/tests/ci/test-run-sim-slave-counters.sh
diff --git a/ci/templates.yml b/ci/templates.yml
@@ -0,0 +1,58 @@
+
+.template_base:
+  image: ${IPBUS_DOCKER_REGISTRY}/ipbus-fw-dev-cc7:2019-09-17__ipbb0.5.2
+  before_script:
+    - source /software/Xilinx/Vivado/${VIVADO_VERSION}/settings64.sh
+
+
+.template_vivado_quick_check:
+  extends: .template_base
+  tags:
+    - docker
+    - xilinx-tools
+  stage: quick_checks
+  script:
+    - ipbb init work_area
+    - cd work_area
+    - ln -s ${CI_PROJECT_DIR} src/ipbus-firmware
+    - ipbb proj create vivado -t top_${PROJ}.dep ${CI_JOB_NAME#quick_check:} ipbus-firmware:projects/example
+    - cd proj/${CI_JOB_NAME#quick_check:}
+    - ipbb vivado make-project
+    - ipbb vivado check-syntax
+  artifacts:
+    when: on_success
+    paths:
+      - work_area
+    expire_in: 1 day
+
+
+.template_vivado_build:
+  extends: .template_base
+  tags:
+    - docker
+    - xilinx-tools
+  stage: builds
+  only:
+    - /^pull-requests.[0-9]+$/
+    - master
+    - tags
+    - web
+  script:
+    - cd work_area/proj/${CI_JOB_NAME#build:}
+    - ipbb vivado synth -j4
+    - ipbb vivado impl
+    - ipbb vivado bitfile
+    - ipbb vivado package
+  after_script:
+    - export PROJ_NAME=${CI_JOB_NAME#build:}
+    - export ARTIFACT_DIR=build_results/${PROJ_NAME%__${VIVADO_VERSION}}/vivado${VIVADO_VERSION}/
+    - mkdir -p ${ARTIFACT_DIR}/logs
+    - cp -v work_area/proj/${PROJ_NAME}/package/*.tgz ${ARTIFACT_DIR}/ 2>/dev/null || true
+    - cp -v work_area/proj/${PROJ_NAME}/*.log ${ARTIFACT_DIR}/logs 2>/dev/null || true
+    - cp -v work_area/proj/${PROJ_NAME}/*.jou ${ARTIFACT_DIR}/logs 2>/dev/null || true
+  artifacts:
+    when: always
+    name: "${CI_JOB_NAME#build:}-on-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHA:0:8}"
+    paths:
+      - build_results
+    expire_in: 2 weeks
diff --git a/ci/vivado-builds.yml b/ci/vivado-builds.yml
@@ -0,0 +1,125 @@
+
+build:enclustra_ax3_pm3_a35__2018.3:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2018.3"
+  dependencies:
+    - quick_check:enclustra_ax3_pm3_a35__2018.3
+build:enclustra_ax3_pm3_a35__2019.2:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2019.2"
+  dependencies:
+    - quick_check:enclustra_ax3_pm3_a35__2019.2
+
+build:enclustra_ax3_pm3_a50__2018.3:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2018.3"
+  dependencies:
+    - quick_check:enclustra_ax3_pm3_a50__2018.3
+build:enclustra_ax3_pm3_a50__2019.2:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2019.2"
+  dependencies:
+    - quick_check:enclustra_ax3_pm3_a50__2019.2
+
+build:kc705_basex__2018.3:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2018.3"
+  dependencies:
+    - quick_check:kc705_basex__2018.3
+build:kc705_basex__2019.2:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2019.2"
+  dependencies:
+    - quick_check:kc705_basex__2019.2
+
+build:kc705_gmii__2018.3:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2018.3"
+  dependencies:
+    - quick_check:kc705_gmii__2018.3
+build:kc705_gmii__2019.2:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2019.2"
+  dependencies:
+    - quick_check:kc705_gmii__2019.2
+
+build:kcu105_basex__2018.3:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2018.3"
+  dependencies:
+    - quick_check:kcu105_basex__2018.3
+build:kcu105_basex__2019.2:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2019.2"
+  dependencies:
+    - quick_check:kcu105_basex__2019.2
+
+build:zcu102_basex__2018.3:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2018.3"
+  dependencies:
+    - quick_check:zcu102_basex__2018.3
+build:zcu102_basex__2019.2:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2019.2"
+  dependencies:
+    - quick_check:zcu102_basex__2019.2
+
+build:zcu102_c2c_loopback__2019.1:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2019.1"
+  dependencies:
+    - quick_check:zcu102_c2c_loopback__2019.1
+
+build:k800__2018.3:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2018.3"
+  dependencies:
+    - quick_check:k800__2018.3
+build:k800__2019.2:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2019.2"
+  dependencies:
+    - quick_check:k800__2019.2
+
+build:vcu118_pcie__2018.3:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2018.3"
+  dependencies:
+    - quick_check:vcu118_pcie__2018.3
+build:vcu118_pcie__2019.2:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2019.2"
+  dependencies:
+    - quick_check:vcu118_pcie__2019.2
+
+build:vcu118_sgmii__2018.3:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2018.3"
+  dependencies:
+    - quick_check:vcu118_sgmii__2018.3
+build:vcu118_sgmii__2019.2:
+  extends: .template_vivado_build
+  variables:
+    VIVADO_VERSION: "2019.2"
+  dependencies:
+    - quick_check:vcu118_sgmii__2019.2
+