diff --git a/cicd_playbook.yml b/cicd_playbook.yml index 229914de571192978f18ca1aa9254cca808ecb9a..6a76a9617daa7fade1d2e2e3245c9e27e6181e93 100644 --- a/cicd_playbook.yml +++ b/cicd_playbook.yml @@ -10,6 +10,7 @@ mpikat_branch: "dev" provision_repository: "https://gitlab.mpcdf.mpg.de/mpifr-bdg/edd_provisioning_effelsberg.git" edd_inventory_folder: "effelsberg_devel" + inventory_dir: "/builds/mpifr-bdg/edd_provisioning/" provision_branch: "devel" version_tag: "cicd" tasks_from: 'main.yml' diff --git a/data/git_token b/data/git_token new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/data/id_rsa b/data/id_rsa new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/data/id_rsa.pub b/data/id_rsa.pub new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/data/registry.key b/data/registry.key new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/roles/packetizer/tasks/main.yml b/roles/packetizer/tasks/main.yml index 6ed3ba99e33ce5b731faa04c2003dc0b4179dde5..2dc02e7e4837b0e2aa7d206402acd3578870dff8 100644 --- a/roles/packetizer/tasks/main.yml +++ b/roles/packetizer/tasks/main.yml @@ -34,7 +34,7 @@ with_items: "{{ core_files }}" -- name: Ensure defaqult firmware version link +- name: Ensure default firmware version link ansible.builtin.file: src: "/usr/share/packer/{{ core_file }}" dest: /usr/share/packer/virtex7_dk769b.bin @@ -44,8 +44,6 @@ register: packer_program - - - name: Install packer cfg ansible.builtin.template: src: packer.cfg diff --git a/roles/pulsar_pipeline/tasks/main.yml b/roles/pulsar_pipeline/tasks/main.yml index aee1cb4031340006246e1b5fb6a80b24adf25d3c..38e0b5e83d5ea202d83a297201876c03dd725b7c 100644 --- a/roles/pulsar_pipeline/tasks/main.yml +++ b/roles/pulsar_pipeline/tasks/main.yml @@ -41,7 +41,24 @@ - never # only run when build tag is specified - buildbase +- name: Copy additional build files + tags: + - never + - build + block: + - name: Create temporary data directory + tempfile: + state: directory + register: additional_build_files + check_mode: false + - name: Copy git token + copy: + src: "{{ inventory_dir }}/data/git_token" + dest: "{{ additional_build_files.path }}/git_token" + mode: go-rwx + decrypt: yes + when: inventory_dir is defined - name: Pulsar Pipeline include_role: @@ -63,6 +80,12 @@ tags: - always +- name: Remove the temporary data directory + file: + path: "{{ additional_build_files.path }}" + state: absent + when: additional_build_files.path is defined + check_mode: false - name: Build check docker image block: diff --git a/roles/pulsar_pipeline/templates/Dockerfile b/roles/pulsar_pipeline/templates/Dockerfile index f9c6b96d94dabd352a843522ef80169c1e4be566..f782349d0fac82c795d9a2a4f8f98332e540467f 100644 --- a/roles/pulsar_pipeline/templates/Dockerfile +++ b/roles/pulsar_pipeline/templates/Dockerfile @@ -54,7 +54,6 @@ RUN git clone {{ mpikat_repository }} mpikat &&\ git checkout {{ mpikat_branch }} && \ pip3 install . - +COPY git_token /tmp/git_token WORKDIR /src/ -CMD /bin/cp -r /media/scratch/jason/epta/ /tmp/ ; python3 /src/mpikat/mpikat/effelsberg/edd/pipeline/pipeline_rnt.py --host=0.0.0.0 --port=10001 --log_level=debug diff --git a/roles/pulsar_pipeline/templates/Dockerfile_pulsarbase b/roles/pulsar_pipeline/templates/Dockerfile_pulsarbase index 41e0553312e42326c054648a5b9e4f93f70b4713..bdd579c608a9f15887599dbe019c90d555dd5b30 100644 --- a/roles/pulsar_pipeline/templates/Dockerfile_pulsarbase +++ b/roles/pulsar_pipeline/templates/Dockerfile_pulsarbase @@ -183,6 +183,5 @@ RUN git checkout {{ dspsr_version }} && \ cp filterbank_bench.out /src/psrchive/install/share/filterbank_bench_CUDA.dat WORKDIR /src/ -CMD /bin/cp -r /media/scratch/jason/epta/ /tmp/ ; python3 /src/mpikat/mpikat/effelsberg/edd/pipeline/pipeline_rnt.py --host=0.0.0.0 --port=10001 --log_level=debug