Extend gitlab ci targets for tapasco runtime

.gitlab-ci.yml

@@ -229,152 +229,140 @@ build_kernel_fedora_29_debug:
     paths:
       - tlkm/tlkm.ko
 
-build_tapasco_ubuntu_16_04:
+.build_tapasco:
   stage: build_runtime
-  image: ubuntu:xenial
+  variables:
+    MODE: "release"
   tags:
     - CAD
     - Normal
   script:
-    - apt-get -y update && apt-get -y install build-essential linux-headers-generic python cmake libelf-dev libncurses-dev git rpm
     - source setup.sh
-    - tapasco-build-libs --mode=release --skip_driver
+    - tapasco-build-libs --mode=$MODE --skip_driver
     - cd build && make package
-  artifacts:
-    paths:
-      - build/tapasco-2018.2.1-Linux.deb
 
-build_tapasco_ubuntu_18_04:
-  stage: build_runtime
-  image: ubuntu:cosmic
-  tags:
-    - CAD
-    - Normal
-  script:
-    - apt-get -y update && apt-get -y install build-essential linux-headers-generic python cmake libelf-dev libncurses-dev git rpm
-    - source setup.sh
-    - tapasco-build-libs --mode=release --skip_driver
-    - cd build && make package
+.build_tapasco_fedora:
+  before_script:
+    - dnf -y install kernel-devel make gcc gcc-c++ elfutils-libelf-devel cmake ncurses-devel python libatomic git rpm-build
   artifacts:
     paths:
-      - build/tapasco-2018.2.1-Linux.deb
+      - build/tapasco-2018.2.1-Linux.rpm
+  extends: .build_tapasco
+
+build_tapasco_fedora_24:
+  image: fedora:24
+  extends: .build_tapasco_fedora
+
+build_tapasco_fedora_25:
+  image: fedora:25
+  extends: .build_tapasco_fedora
+
+build_tapasco_fedora_26:
+  image: fedora:26
+  extends: .build_tapasco_fedora
 
 build_tapasco_fedora_27:
-  stage: build_runtime
   image: fedora:27
-  tags:
-    - CAD
-    - Normal
-  script:
-    - dnf -y install kernel-devel make gcc gcc-c++ elfutils-libelf-devel cmake ncurses-devel python libatomic git rpm-build
-    - source setup.sh
-    - tapasco-build-libs --mode=release --skip_driver
-    - cd build && make package
-  artifacts:
-    paths:
-      - build/tapasco-2018.2.1-Linux.rpm
+  extends: .build_tapasco_fedora
 
 build_tapasco_fedora_28:
-  stage: build_runtime
   image: fedora:28
-  tags:
-    - CAD
-    - Normal
-  script:
-    - dnf -y install kernel-devel make gcc gcc-c++ elfutils-libelf-devel cmake ncurses-devel python libatomic git rpm-build
-    - source setup.sh
-    - tapasco-build-libs --mode=release --skip_driver
-    - cd build && make package
-  artifacts:
-    paths:
-      - build/tapasco-2018.2.1-Linux.rpm
+  extends: .build_tapasco_fedora
 
 build_tapasco_fedora_29:
-  stage: build_runtime
-  image: fedora:28
-  tags:
-    - CAD
-    - Normal
-  script:
-    - dnf -y install kernel-devel make gcc gcc-c++ elfutils-libelf-devel cmake ncurses-devel python libatomic git rpm-build
-    - source setup.sh
-    - tapasco-build-libs --mode=release --skip_driver
-    - cd build && make package
-  artifacts:
-    paths:
-      - build/tapasco-2018.2.1-Linux.rpm
+  image: fedora:29
+  extends: .build_tapasco_fedora
 
-build_tapasco_ubuntu_16_04_debug:
-  stage: build_runtime
-  image: ubuntu:xenial
-  tags:
-    - CAD
-    - Normal
-  script:
-    - apt-get -y update && apt-get -y install build-essential linux-headers-generic python cmake libelf-dev libncurses-dev git rpm
-    - source setup.sh
-    - tapasco-build-libs --mode=debug --skip_driver
-    - cd build && make package
-  artifacts:
-    paths:
-      - build/tapasco-2018.2.1-Linux.deb
+build_tapasco_fedora_30:
+  image: fedora:30
+  extends: .build_tapasco_fedora
 
-build_tapasco_ubuntu_18_04_debug:
-  stage: build_runtime
-  image: ubuntu:cosmic
-  tags:
-    - CAD
-    - Normal
-  script:
-    - apt-get -y update && apt-get -y install build-essential linux-headers-generic python cmake libelf-dev libncurses-dev git rpm
-    - source setup.sh
-    - tapasco-build-libs --mode=debug --skip_driver
-    - cd build && make package
-  artifacts:
-    paths:
-      - build/tapasco-2018.2.1-Linux.deb
+build_tapasco_fedora_24_debug:
+  variables:
+    MODE: "debug"
+  image: fedora:24
+  extends: .build_tapasco_fedora
+
+build_tapasco_fedora_25_debug:
+  variables:
+    MODE: "debug"
+  image: fedora:25
+  extends: .build_tapasco_fedora
+
+build_tapasco_fedora_26_debug:
+  variables:
+    MODE: "debug"
+  image: fedora:26
+  extends: .build_tapasco_fedora
 
 build_tapasco_fedora_27_debug:
-  stage: build_runtime
+  variables:
+    MODE: "debug"
   image: fedora:27
-  tags:
-    - CAD
-    - Normal
-  script:
-    - dnf -y install kernel-devel make gcc gcc-c++ elfutils-libelf-devel cmake ncurses-devel python libatomic git rpm-build
-    - source setup.sh
-    - tapasco-build-libs --mode=debug --skip_driver
-    - cd build && make package
-  artifacts:
-    paths:
-      - build/tapasco-2018.2.1-Linux.rpm
+  extends: .build_tapasco_fedora
 
 build_tapasco_fedora_28_debug:
-  stage: build_runtime
+  variables:
+    MODE: "debug"
   image: fedora:28
-  tags:
-    - CAD
-    - Normal
-  script:
-    - dnf -y install kernel-devel make gcc gcc-c++ elfutils-libelf-devel cmake ncurses-devel python libatomic git rpm-build
-    - source setup.sh
-    - tapasco-build-libs --mode=debug --skip_driver
-    - cd build && make package
-  artifacts:
-    paths:
-      - build/tapasco-2018.2.1-Linux.rpm
+  extends: .build_tapasco_fedora
 
 build_tapasco_fedora_29_debug:
-  stage: build_runtime
+  variables:
+    MODE: "debug"
   image: fedora:29
-  tags:
-    - CAD
-    - Normal
-  script:
-    - dnf -y install kernel-devel make gcc gcc-c++ elfutils-libelf-devel cmake ncurses-devel python libatomic git rpm-build
-    - source setup.sh
-    - tapasco-build-libs --mode=debug --skip_driver
-    - cd build && make package
+  extends: .build_tapasco_fedora
+
+build_tapasco_fedora_30_debug:
+  variables:
+    MODE: "debug"
+  image: fedora:30
+  extends: .build_tapasco_fedora
+
+.build_tapasco_ubuntu:
+  before_script:
+    - apt-get -y update && apt-get -y install build-essential linux-headers-generic python cmake libelf-dev libncurses-dev git rpm
   artifacts:
     paths:
-      - build/tapasco-2018.2.1-Linux.rpm
\ No newline at end of file
+      - build/tapasco-2018.2.1-Linux.deb
+  extends: .build_tapasco
+
+build_tapasco_ubuntu_16_04:
+  image: ubuntu:xenial
+  extends: .build_tapasco_ubuntu
+
+build_tapasco_ubuntu_18_04:
+  image: ubuntu:bionic
+  extends: .build_tapasco_ubuntu
+
+build_tapasco_ubuntu_18_10:
+  image: ubuntu:cosmic
+  extends: .build_tapasco_ubuntu
+
+build_tapasco_ubuntu_19_04:
+  image: ubuntu:disco
+  extends: .build_tapasco_ubuntu
+
+build_tapasco_ubuntu_16_04_debug:
+  variables:
+    MODE: "debug"
+  image: ubuntu:xenial
+  extends: .build_tapasco_ubuntu
+
+build_tapasco_ubuntu_18_04_debug:
+  variables:
+    MODE: "debug"
+  image: ubuntu:bionic
+  extends: .build_tapasco_ubuntu
+
+build_tapasco_ubuntu_18_10_debug:
+  variables:
+    MODE: "debug"
+  image: ubuntu:cosmic
+  extends: .build_tapasco_ubuntu
+
+build_tapasco_ubuntu_19_04_debug:
+  variables:
+    MODE: "debug"
+  image: ubuntu:disco
+  extends: .build_tapasco_ubuntu

gitlab-ci-base.yml

-image: tapasco
-
-variables:
-  XILINXD_LICENSE_FILE: "/opt/cad/keys/xilinx"
-
-before_script:
-  - uname -a
-  - echo $SHELL
-  - echo $PWD
-  - source $PWD/setup.sh
-  - source /root/.sdkman/bin/sdkman-init.sh
-  - export SBT_OPTS="-Dsbt.global.base=$TAPASCO_HOME/.sbt/ -Dsbt.ivy.home=$TAPASCO_HOME/.ivy2/ -Divy.home=$TAPASCO_HOME/.ivy2/"
-
-stages:
-  - toolchain-test
-  - hls
-  - import
-  - compose
-  - compose-features
-  - dse
-
-scala-test:
-  stage: toolchain-test
-  script:
-    - sbt clean test
-
-.template: &template
-  only:
-    - "gitlab-ci"
-    - "master"
-    - /20\d\d\.\d/
-
-sbt-prepare:
-  <<: *template
-  stage: toolchain-test
-  cache:
-      untracked: true
-      key: "$CI_COMMIT_SHA-$CI_COMMIT_REF_NAME"
-      policy: push
-  script:
-    - sbt assembly
-
-.hls-template: &hls-definition
-  <<: *template
-  stage: hls
-  dependencies:
-    - sbt-prepare
-  cache:
-      untracked: true
-      key: "$CI_COMMIT_SHA-$CI_COMMIT_REF_NAME"
-      policy: pull
-  artifacts:
-      when: always
-      expire_in: 1 hours
-      paths:
-        - core
-  script:
-    - source /opt/cad/$VIVADO_OFFSET/settings64.sh
-    - vivado -version
-    - |
-      if [ ! -d ".ivy2" ]; then
-        echo "Cache not available"
-        sbt assembly
-      fi
-    - tapasco -v hls arraysum, arrayinit -a $ARCHS -p $PLATFORMS
-
-.import-template: &import-definition
-  <<: *template
-  stage: import
-  dependencies:
-    - sbt-prepare
-  cache:
-      untracked: true
-      key: "$CI_COMMIT_SHA-$CI_COMMIT_REF_NAME"
-      policy: pull
-  script:
-    - source /opt/cad/$VIVADO_OFFSET/settings64.sh
-    - |
-      if [ ! -d ".ivy2" ]; then
-        echo "Cache not available"
-        sbt assembly
-      fi
-    - cd $TAPASCO_HOME/common/ip && zip -r precision_counter.zip precision_counter*
-    - tapasco -v import $TAPASCO_HOME/common/ip/precision_counter.zip as 14 -a $ARCHS -p $PLATFORMS
-
-.compose-template: &compose-definition
-  <<: *template
-  stage: compose
-  cache:
-      untracked: true
-      key: "$CI_COMMIT_SHA-$CI_COMMIT_REF_NAME"
-      policy: pull
-  script:
-    - source /opt/cad/$VIVADO_OFFSET/settings64.sh
-    - |
-      if [ ! -d ".ivy2" ]; then
-        echo "Cache not available"
-        sbt assembly
-      fi
-    - tapasco -v --maxTasks 1 compose [arraysum x 1, arrayupdate x 1] @ 100 MHz -a $ARCHS -p $PLATFORMS
-
-.compose-features-template: &compose-features-definition
-  <<: *template
-  stage: compose-features
-  cache:
-      untracked: true
-      key: "$CI_COMMIT_SHA-$CI_COMMIT_REF_NAME"
-      policy: pull
-  script:
-    - source /opt/cad/$VIVADO_OFFSET/settings64.sh
-    - |
-      if [ ! -d ".ivy2" ]; then
-        echo "Cache not available"
-        sbt assembly
-      fi
-    - tapasco -v --maxTasks 1 compose [arraysum x 1, arrayupdate x 1] @ 100 MHz -a $ARCHS -p $PLATFORMS --features "$FEATURES"
-