From 930d03bf1a1457a0b30de5f7dd6f5cf14c14fde7 Mon Sep 17 00:00:00 2001 From: "M. Chandler Bennett" Date: Mon, 31 Jan 2022 11:11:48 -0500 Subject: [PATCH 1/7] Update dependencies --- external/qp2-dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/qp2-dependencies b/external/qp2-dependencies index bc856147..90ee61f5 160000 --- a/external/qp2-dependencies +++ b/external/qp2-dependencies @@ -1 +1 @@ -Subproject commit bc856147f6e626a6616b20344e5b8e3f30f44a92 +Subproject commit 90ee61f5041c7c94a0c605625a264860292813a0 From 32b8663fa1d0bb6127833d089a8fd6b8a79b1a6f Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Mon, 31 Jan 2022 17:23:08 +0100 Subject: [PATCH 2/7] Update submodules --- external/qp2-dependencies | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/qp2-dependencies b/external/qp2-dependencies index bc856147..90ee61f5 160000 --- a/external/qp2-dependencies +++ b/external/qp2-dependencies @@ -1 +1 @@ -Subproject commit bc856147f6e626a6616b20344e5b8e3f30f44a92 +Subproject commit 90ee61f5041c7c94a0c605625a264860292813a0 From 82409d3e737ba3481523051248065c3fd9d1fab1 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Tue, 12 Apr 2022 15:49:20 +0200 Subject: [PATCH 3/7] Added drone CI config --- .drone.yml | 36 ++++++++++++++++++++++++++++++ drone/Docker/README.md | 8 +++++++ drone/Docker/Ubuntu/Dockerfile | 27 ++++++++++++++++++++++ {travis => drone}/compilation.sh | 0 {travis => drone}/configuration.sh | 0 {travis => drone}/testing.sh | 0 6 files changed, 71 insertions(+) create mode 100644 .drone.yml create mode 100644 drone/Docker/README.md create mode 100644 drone/Docker/Ubuntu/Dockerfile rename {travis => drone}/compilation.sh (100%) rename {travis => drone}/configuration.sh (100%) rename {travis => drone}/testing.sh (100%) diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 00000000..39d035db --- /dev/null +++ b/.drone.yml @@ -0,0 +1,36 @@ +--- +kind: pipeline +type: ssh +name: default + +clone: + depth: 10 + +server: + host: 130.120.229.139 + user: test + password: + from_secret: ssh_pass + +steps: +- name: configure + pull: never + image: ubuntu/qp2_env + commands: + - ./configure -i all -c ./config/gfortran_debug.cfg + - source quantum_package.rc ; qp plugins download https://gitlab.com/scemama/qp_plugins_scemama + - source quantum_package.rc ; qp plugins install champ + +- name: compile + pull: never + image: ubuntu/qp2_env + commands: + - ninja + +- name: testing + pull: never + image: ubuntu/qp2_env + commands: + - qp test + + diff --git a/drone/Docker/README.md b/drone/Docker/README.md new file mode 100644 index 00000000..eb569777 --- /dev/null +++ b/drone/Docker/README.md @@ -0,0 +1,8 @@ +Docker files to build the containers used with DroneCI. + +Example: +``` +docker build -t ubuntu/qp2_env . + +``` + diff --git a/drone/Docker/Ubuntu/Dockerfile b/drone/Docker/Ubuntu/Dockerfile new file mode 100644 index 00000000..05d87ad8 --- /dev/null +++ b/drone/Docker/Ubuntu/Dockerfile @@ -0,0 +1,27 @@ +ARG UBUNTU_VERSION=20.04 +FROM ubuntu:${UBUNTU_VERSION} AS builder + +# Timezone for tzdata +ARG tz=Etc/UTC +RUN echo $tz > /etc/timezone && rm -rf /etc/localtime + +# Install +RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ + git \ + curl \ + wget \ + python3 \ + gfortran \ + gcc \ + g++ \ + make \ + build-essential \ + rsync \ + unzip \ + libopenblas-dev \ + pkg-config \ + m4 + +RUN ln -s /usr/bin/python3 /usr/bin/python + + diff --git a/travis/compilation.sh b/drone/compilation.sh similarity index 100% rename from travis/compilation.sh rename to drone/compilation.sh diff --git a/travis/configuration.sh b/drone/configuration.sh similarity index 100% rename from travis/configuration.sh rename to drone/configuration.sh diff --git a/travis/testing.sh b/drone/testing.sh similarity index 100% rename from travis/testing.sh rename to drone/testing.sh From 554af892ff1568491475033a5d4201e81551d54a Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Tue, 12 Apr 2022 15:55:51 +0200 Subject: [PATCH 4/7] Update drone --- .drone.yml | 37 +------------------------------------ drone/drone_docker | 30 ++++++++++++++++++++++++++++++ drone/drone_ssh | 30 ++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 36 deletions(-) mode change 100644 => 120000 .drone.yml create mode 100644 drone/drone_docker create mode 100644 drone/drone_ssh diff --git a/.drone.yml b/.drone.yml deleted file mode 100644 index 39d035db..00000000 --- a/.drone.yml +++ /dev/null @@ -1,36 +0,0 @@ ---- -kind: pipeline -type: ssh -name: default - -clone: - depth: 10 - -server: - host: 130.120.229.139 - user: test - password: - from_secret: ssh_pass - -steps: -- name: configure - pull: never - image: ubuntu/qp2_env - commands: - - ./configure -i all -c ./config/gfortran_debug.cfg - - source quantum_package.rc ; qp plugins download https://gitlab.com/scemama/qp_plugins_scemama - - source quantum_package.rc ; qp plugins install champ - -- name: compile - pull: never - image: ubuntu/qp2_env - commands: - - ninja - -- name: testing - pull: never - image: ubuntu/qp2_env - commands: - - qp test - - diff --git a/.drone.yml b/.drone.yml new file mode 120000 index 00000000..b44fc76b --- /dev/null +++ b/.drone.yml @@ -0,0 +1 @@ +drone/drone_ssh \ No newline at end of file diff --git a/drone/drone_docker b/drone/drone_docker new file mode 100644 index 00000000..0cbeb613 --- /dev/null +++ b/drone/drone_docker @@ -0,0 +1,30 @@ +--- +kind: pipeline +type: ssh +name: default + +clone: + depth: 10 + +steps: +- name: configure + pull: never + image: ubuntu/qp2_env + commands: + - ./configure -i all -c ./config/gfortran_debug.cfg + - source quantum_package.rc ; qp plugins download https://gitlab.com/scemama/qp_plugins_scemama + - source quantum_package.rc ; qp plugins install champ + +- name: compile + pull: never + image: ubuntu/qp2_env + commands: + - ninja + +- name: testing + pull: never + image: ubuntu/qp2_env + commands: + - qp test + + diff --git a/drone/drone_ssh b/drone/drone_ssh new file mode 100644 index 00000000..e15b3fd5 --- /dev/null +++ b/drone/drone_ssh @@ -0,0 +1,30 @@ +--- +kind: pipeline +type: ssh +name: default + +clone: + depth: 10 + +server: + host: 130.120.229.139 + user: test + password: + from_secret: ssh_pass + +steps: +- name: configure + commands: + - ./configure -i all -c ./config/gfortran_debug.cfg + - source quantum_package.rc ; qp plugins download https://gitlab.com/scemama/qp_plugins_scemama + - source quantum_package.rc ; qp plugins install champ + +- name: compile + commands: + - ninja + +- name: testing + commands: + - qp test + + From c3d95a8562cf128c56d598a644e9900831ced72c Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Tue, 12 Apr 2022 16:00:33 +0200 Subject: [PATCH 5/7] Drone --- drone/{drone_docker => drone_docker.yml} | 0 drone/{drone_ssh => drone_ssh.yml} | 1 - 2 files changed, 1 deletion(-) rename drone/{drone_docker => drone_docker.yml} (100%) rename drone/{drone_ssh => drone_ssh.yml} (99%) diff --git a/drone/drone_docker b/drone/drone_docker.yml similarity index 100% rename from drone/drone_docker rename to drone/drone_docker.yml diff --git a/drone/drone_ssh b/drone/drone_ssh.yml similarity index 99% rename from drone/drone_ssh rename to drone/drone_ssh.yml index e15b3fd5..99397f11 100644 --- a/drone/drone_ssh +++ b/drone/drone_ssh.yml @@ -1,4 +1,3 @@ ---- kind: pipeline type: ssh name: default From 57bf2e2739873d83fc93138fa27dfa53cc52d803 Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Tue, 12 Apr 2022 17:25:48 +0200 Subject: [PATCH 6/7] Drone --- .drone.yml | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) mode change 120000 => 100644 .drone.yml diff --git a/.drone.yml b/.drone.yml deleted file mode 120000 index b44fc76b..00000000 --- a/.drone.yml +++ /dev/null @@ -1 +0,0 @@ -drone/drone_ssh \ No newline at end of file diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 00000000..99397f11 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,29 @@ +kind: pipeline +type: ssh +name: default + +clone: + depth: 10 + +server: + host: 130.120.229.139 + user: test + password: + from_secret: ssh_pass + +steps: +- name: configure + commands: + - ./configure -i all -c ./config/gfortran_debug.cfg + - source quantum_package.rc ; qp plugins download https://gitlab.com/scemama/qp_plugins_scemama + - source quantum_package.rc ; qp plugins install champ + +- name: compile + commands: + - ninja + +- name: testing + commands: + - qp test + + From e813fd04f92d0ceabd39b526db86c68dcfec8b6f Mon Sep 17 00:00:00 2001 From: Anthony Scemama Date: Tue, 12 Apr 2022 17:29:29 +0200 Subject: [PATCH 7/7] Drone --- .drone.yml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 99397f11..0cbeb613 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,3 +1,4 @@ +--- kind: pipeline type: ssh name: default @@ -5,24 +6,24 @@ name: default clone: depth: 10 -server: - host: 130.120.229.139 - user: test - password: - from_secret: ssh_pass - steps: - name: configure + pull: never + image: ubuntu/qp2_env commands: - ./configure -i all -c ./config/gfortran_debug.cfg - source quantum_package.rc ; qp plugins download https://gitlab.com/scemama/qp_plugins_scemama - source quantum_package.rc ; qp plugins install champ - name: compile + pull: never + image: ubuntu/qp2_env commands: - ninja - name: testing + pull: never + image: ubuntu/qp2_env commands: - qp test