Merge branch 'fix-var-naming' into 'master'

Rename var

See merge request !5

.gitlab-ci.yml

@@ -4,7 +4,7 @@ stages:
   - upload
 
 variables:
-  PYTHON_VERSION_3_8: "3.8.8"
+  PYTHON_VERSION_3: "3.8.8"
   S3_BASE: https://s3.getnoc.com
   S3_BUCKET: $CI_PROJECT_NAMESPACE
   COMPILE_FLAGS_DEB: "--with-system-ffi --with-computed-gotos --enable-loadable-sqlite-extensions"
@@ -15,40 +15,40 @@ compile_RedHat:
   extends: .base_compile
   image: centos:7
   script:
-    - mkdir -p /opt/python$PYTHON_VERSION_3_8
+    - mkdir -p /opt/python$PYTHON_VERSION_3
     - >
       yum update -y -q && yum install -y -q
       curl make
       gcc openssl-devel bzip2-devel libffi-devel sqlite-devel cmake
       gdbm-devel xz-devel readline-devel  ncurses-devel zlib-devel
-    - curl -o /tmp/python.tar.gz https://www.python.org/ftp/python/$PYTHON_VERSION_3_8/Python-$PYTHON_VERSION_3_8.tgz
+    - curl -o /tmp/python.tar.gz https://www.python.org/ftp/python/$PYTHON_VERSION_3/Python-$PYTHON_VERSION_3.tgz
     - tar -zxf /tmp/python.tar.gz -C /opt
-    - cd /opt/Python-$PYTHON_VERSION_3_8
-    - ./configure --prefix=/opt/python$PYTHON_VERSION_3_8 --enable-optimizations $COMPILE_FLAGS_RPM
+    - cd /opt/Python-$PYTHON_VERSION_3
+    - ./configure --prefix=/opt/python$PYTHON_VERSION_3 --enable-optimizations $COMPILE_FLAGS_RPM
     - make -s
     - make install
-    - /opt/python$PYTHON_VERSION_3_8/bin/python3 -V || true
-    - tar czf "${CI_PROJECT_DIR}/python${PYTHON_VERSION_3_8}.tar.gz" -C /opt/python$PYTHON_VERSION_3_8/ .
+    - /opt/python$PYTHON_VERSION_3/bin/python3 -V || true
+    - tar czf "${CI_PROJECT_DIR}/python${PYTHON_VERSION_3}.tar.gz" -C /opt/python$PYTHON_VERSION_3/ .
 
 .base_compile:
   stage: compile
   image: debian:10
   script:
-    - mkdir -p /opt/python$PYTHON_VERSION_3_8
+    - mkdir -p /opt/python$PYTHON_VERSION_3
     - >
         apt-get update -qq && apt-get install -y -qq
         curl
         build-essential
         libssl-dev zlib1g-dev libncurses5-dev libncursesw5-dev libreadline-dev libsqlite3-dev
         libgdbm-dev libdb5.3-dev libbz2-dev libexpat1-dev liblzma-dev libffi-dev uuid-dev
-    - curl -o /tmp/python.tar.gz https://www.python.org/ftp/python/$PYTHON_VERSION_3_8/Python-$PYTHON_VERSION_3_8.tgz
+    - curl -o /tmp/python.tar.gz https://www.python.org/ftp/python/$PYTHON_VERSION_3/Python-$PYTHON_VERSION_3.tgz
     - tar -zxf /tmp/python.tar.gz -C /opt
-    - cd /opt/Python-$PYTHON_VERSION_3_8
-    - ./configure --prefix=/opt/python$PYTHON_VERSION_3_8 --enable-optimizations $COMPILE_FLAGS_DEB
+    - cd /opt/Python-$PYTHON_VERSION_3
+    - ./configure --prefix=/opt/python$PYTHON_VERSION_3 --enable-optimizations $COMPILE_FLAGS_DEB
     - make -s
     - make install
-    - /opt/python$PYTHON_VERSION_3_8/bin/python3 -V || true
-    - tar czf "${CI_PROJECT_DIR}/python${PYTHON_VERSION_3_8}.tar.gz" -C /opt/python$PYTHON_VERSION_3_8/ .
+    - /opt/python$PYTHON_VERSION_3/bin/python3 -V || true
+    - tar czf "${CI_PROJECT_DIR}/python${PYTHON_VERSION_3}.tar.gz" -C /opt/python$PYTHON_VERSION_3/ .
   artifacts:
     paths:
       - python*.tar.gz
@@ -82,7 +82,7 @@ compile_Ubuntu_20:
   stage: upload
   image: registry.getnoc.com/infrastructure/s3helper:master
   before_script:
-    - sha1sum python${PYTHON_VERSION_3_8}.tar.gz | awk '{ print $1 }' > python${PYTHON_VERSION_3_8}.tar.gz_SHA1SUMS
+    - sha1sum python${PYTHON_VERSION_3}.tar.gz | awk '{ print $1 }' > python${PYTHON_VERSION_3}.tar.gz_SHA1SUMS
   tags:
     - docker
   rules:
@@ -92,7 +92,7 @@ compile_Ubuntu_20:
 upload_RedHat:
   extends: .base_upload
   script:
-    - /tmp/mc -q cp python${PYTHON_VERSION_3_8}.* cdn/$S3_BUCKET/repo/RedHat/7/
+    - /tmp/mc -q cp python${PYTHON_VERSION_3}.* cdn/$S3_BUCKET/repo/RedHat/7/
   needs:
     - job: compile_RedHat
       artifacts: true
@@ -100,7 +100,7 @@ upload_RedHat:
 upload_Debian10:
   extends: .base_upload
   script:
-    - /tmp/mc -q cp python${PYTHON_VERSION_3_8}.* cdn/$S3_BUCKET/repo/Debian/10/
+    - /tmp/mc -q cp python${PYTHON_VERSION_3}.* cdn/$S3_BUCKET/repo/Debian/10/
   needs:
     - job: compile_Debian_10
       artifacts: true
@@ -108,7 +108,7 @@ upload_Debian10:
 upload_Debian9:
   extends: .base_upload
   script:
-    - /tmp/mc -q cp python${PYTHON_VERSION_3_8}.* cdn/$S3_BUCKET/repo/Debian/9/
+    - /tmp/mc -q cp python${PYTHON_VERSION_3}.* cdn/$S3_BUCKET/repo/Debian/9/
   needs:
     - job: compile_Debian_9
       artifacts: true
@@ -116,7 +116,7 @@ upload_Debian9:
 upload_Ubuntu16:
   extends: .base_upload
   script:
-    - /tmp/mc -q cp python${PYTHON_VERSION_3_8}.* cdn/$S3_BUCKET/repo/Debian/16/
+    - /tmp/mc -q cp python${PYTHON_VERSION_3}.* cdn/$S3_BUCKET/repo/Debian/16/
   needs:
     - job: compile_Ubuntu_16
       artifacts: true
@@ -124,7 +124,7 @@ upload_Ubuntu16:
 upload_Ubuntu18:
   extends: .base_upload
   script:
-    - /tmp/mc -q cp python${PYTHON_VERSION_3_8}.* cdn/$S3_BUCKET/repo/Debian/18/
+    - /tmp/mc -q cp python${PYTHON_VERSION_3}.* cdn/$S3_BUCKET/repo/Debian/18/
   needs:
     - job: compile_Ubuntu_18
       artifacts: true
@@ -132,7 +132,7 @@ upload_Ubuntu18:
 upload_Ubuntu20:
   extends: .base_upload
   script:
-    - /tmp/mc -q cp python${PYTHON_VERSION_3_8}.* cdn/$S3_BUCKET/repo/Debian/20/
+    - /tmp/mc -q cp python${PYTHON_VERSION_3}.* cdn/$S3_BUCKET/repo/Debian/20/
   needs:
     - job: compile_Ubuntu_20
       artifacts: true