Merge branch 'mc-s3-client' into 'master'

Replace python script with mc client

See merge request !7

ci/templates/vivado-jobs.yml

@@ -10,7 +10,7 @@ stages:
 
 variables:
   IPBB_OS: "c8"
-  IPBB_VER: "dev-2021i-v1.0"
+  IPBB_VER: "dev-2021i-v1.2"
   VIVADO_VER: "2020.2"
   PROJECT_DEPFILE: "top.dep"
   PROJECT_NAME: "$CI_PROJECT_NAME-$PROJECT_ALGORITHM"
@@ -31,12 +31,18 @@ variables:
   after_script:
     - mkdir -p $CI_PROJECT_DIR/ci/builds/artifacts
     - rsync -r $CI_PROJECT_DIR/ci/builds/work/* $CI_PROJECT_DIR/ci/builds/artifacts/ --exclude $CI_PROJECT_DIR/ci/builds/work/var --exclude='*.tar.gz'
-    - python3 /ci-tools/upload_artifacts.py 'ci/builds/artifacts/{src,proj}'
+    - mc alias set openstack https://$ARTIFACTS_HOST $ARTIFACTS_ACCESS_KEY $ARTIFACTS_SECRET_KEY
+    # - s3cmd --configure --host=$ARTIFACTS_HOST --host-bucket="%(bucket)s.s3.cern.ch" --access_key=$ARTIFACTS_ACCESS_KEY --secret_key=$ARTIFACTS_SECRET_KEY -s --no-encrypt --dump-config 2>&1 | tee /root/.s3cfg
+    - tar czf $CI_PIPELINE_ID-$(echo "$CI_JOB_NAME" | tr " " _).tar.gz ./ci/builds/artifacts/{src,proj}
+    # - s3cmd  put '$CI_PIPELINE_ID-$(echo "$CI_JOB_NAME" | tr " " _).tar.gz' s3://$ARTIFACTS_BUCKET
+    - mc cp $CI_PIPELINE_ID-$(echo "$CI_JOB_NAME" | tr " " _).tar.gz openstack/$ARTIFACTS_BUCKET/
 
 .vivado-job:
   extends: .vivado-job-build
   before_script:
-    - python3 /ci-tools/download_artifacts.py
+    - mc alias set openstack https://$ARTIFACTS_HOST $ARTIFACTS_ACCESS_KEY $ARTIFACTS_SECRET_KEY
+    - mc cp openstack/$ARTIFACTS_BUCKET/$CI_PIPELINE_ID-$(echo "$PREVIOUS_JOB" | tr " " _).tar.gz ./
+    - tar xf $CI_PIPELINE_ID-$(echo "$PREVIOUS_JOB" | tr " " _).tar.gz
     - source /opt/Xilinx/Vivado/$VIVADO_VER/settings64.sh
     - mkdir -p ci/builds/work
     - cd ci/builds/work
@@ -124,7 +130,9 @@ Implement:
     - mkdir -p $CI_PROJECT_DIR/ci/builds/artifacts
     - rsync -r $CI_PROJECT_DIR/ci/builds/work/* $CI_PROJECT_DIR/ci/builds/artifacts/ --exclude $CI_PROJECT_DIR/ci/builds/work/var
     - python3 /ci-tools/parse_timing_report.py $CI_PROJECT_DIR/ci/builds/artifacts/proj/$PROJECT_NAME/$PROJECT_NAME/$PROJECT_NAME.runs/impl_1/top_timing_summary_routed.rpt
-    - python3 /ci-tools/upload_artifacts.py 'ci/builds/artifacts/{src,proj}'
+    - mc alias set openstack https://$ARTIFACTS_HOST $ARTIFACTS_ACCESS_KEY $ARTIFACTS_SECRET_KEY
+    - tar czf $CI_PIPELINE_ID-$(echo "$CI_JOB_NAME" | tr " " _).tar.gz ./ci/builds/artifacts/{src,proj}
+    - mc cp $CI_PIPELINE_ID-$(echo "$CI_JOB_NAME" | tr " " _).tar.gz openstack/$ARTIFACTS_BUCKET/ --recursive
   artifacts:
     when: always
     paths: