Use newest enable repo script (#106)

Author: dokshina

.gitlab-ci.yml

@@ -1,7 +1,7 @@
 ---
 variables:
   BUNDLE_VERSION: 2.3.1-13-g882baf7
-  CARTRIDGE_CLI_VERSION: 1.8.0
+  CARTRIDGE_CLI_VERSION: 2.0.0
 
 stages:
   - prebuild
@@ -12,6 +12,7 @@ stages:
 .dind:
   tags:
     - dind
+    - openstack
   services:
     - name: docker:dind
       alias: localhost
@@ -77,7 +78,7 @@ prebuild-unit:
   image: $CI_REGISTRY_IMAGE:packages
   script:
     - tarantool --version
-    - cartridge --version
+    - cartridge version
 
     - ./create-packages.sh
   artifacts:
@@ -90,28 +91,31 @@ prebuild-unit:
 packages-enterprise:
   extends: .packages
   before_script:
+    - curl -L https://tarantool.io/installer.sh | bash -s -- --repo-only
+    - yum install -y cartridge-cli ${CARTRIDGE_CLI_VERSION}
+
     - curl -O -L https://${SDK_DOWNLOAD_USER}:${SDK_DOWNLOAD_TOKEN}@download.tarantool.io/enterprise/tarantool-enterprise-bundle-${BUNDLE_VERSION}.tar.gz
     - tar -xzf tarantool-enterprise-bundle-${BUNDLE_VERSION}.tar.gz
     - rm -rf tarantool-enterprise-bundle-${BUNDLE_VERSION}.tar.gz
     - source tarantool-enterprise/env.sh
+    - rm tarantool-enterprise/cartridge
 
 .packages-opensource:
   extends: .packages
   before_script:
-    - curl -s https://packagecloud.io/install/repositories/tarantool/${TARANTOOL_VERSION}/script.rpm.sh | bash
-    - yum install -y tarantool tarantool-devel
-    - tarantoolctl rocks install cartridge-cli ${CARTRIDGE_CLI_VERSION}
-    - PATH=$PWD/.rocks/bin/:$PATH
+    - curl -L https://tarantool.io/installer.sh | VER=${TARANTOOL_VERSION} bash
+    - yum install -y tarantool-devel
+    - yum install -y cartridge-cli ${CARTRIDGE_CLI_VERSION}
 
 packages-opensource-1.10:
   extends: .packages-opensource
   variables:
-    TARANTOOL_VERSION: '1_10'
+    TARANTOOL_VERSION: '1.10'
 
-packages-opensource-2.2:
+packages-opensource-2.3:
   extends: .packages-opensource
   variables:
-    TARANTOOL_VERSION: '2_2'
+    TARANTOOL_VERSION: '2.3'
 
 
 unit:
@@ -141,7 +145,7 @@ unit:
 
     - docker network create
       --driver bridge
-      --opt com.docker.network.driver.mtu=1450
+      --opt com.docker.network.driver.mtu=1300
       cartridge-network
 
     - molecule test --destroy=never
@@ -159,7 +163,7 @@ test-opensource-1.10:
   dependencies:
     - packages-opensource-1.10
 
-test-opensource-2.2:
+test-opensource-2.3:
   extends: .test
   dependencies:
-    - packages-opensource-2.2
+    - packages-opensource-2.3

Dockerfile

@@ -4,5 +4,7 @@ RUN set -x \
     && apk update && apk add --no-cache \
         docker python3-dev py3-pip docker \
         gcc git curl build-base autoconf automake py3-cryptography linux-headers \
-        musl-dev libffi-dev openssl-dev openssh bash \
-    && pip3 install --upgrade ansible molecule==3.0.2 docker flake8==3.8.1 testinfra
+        musl-dev libffi-dev openssl-dev openssh bash
+
+RUN apk add py3-virtualenv
+RUN virtualenv activate && pip3 install --upgrade ansible==2.8 molecule==3.0.2 docker flake8==3.8.1 testinfra

create-packages.sh

@@ -30,8 +30,8 @@ cartridge create --name ${appname}
 
 sed -i '/cartridge.cfg({/a \ \ \ \ vshard_groups = {hot = { bucket_count = 20000 }},' myapp/init.lua
 
-cartridge pack rpm --version ${version} ${pack_flags} ${appname}
-cartridge pack deb --version ${version} ${pack_flags} ${appname}
+cartridge pack rpm --quiet --version ${version} ${pack_flags} ${appname}
+cartridge pack deb --quiet --version ${version} ${pack_flags} ${appname}
 
 rm -rf ${appname}
 

molecule/default/molecule.yml

@@ -20,7 +20,7 @@ platforms:
       - name: cartridge-network
     purge_networks: true
   - name: vm2
-    image: jrei/systemd-ubuntu
+    image: jrei/systemd-ubuntu:18.04
     command: /lib/systemd/systemd
     tmpfs:
       - /run

tasks/enable_tarantool_repo.yml

@@ -1,15 +1,17 @@
 ---
 - name: Get repository setup script
   get_url:
-    url: 'https://packagecloud.io/install/repositories/{{ repository }}/script.{{ package_type }}.sh'
-    dest: '/tmp/script.{{ package_type }}.sh'
+    url: https://tarantool-io.hb.bizmrg.com/website-static/tarantool/downloads/tarantool_installer.sh
+    dest: '/tmp/tarantool-installer.sh'
   register: get_script
   until: not get_script.failed
   retries: 3
   delay: 5
   any_errors_fatal: true
 
 - name: Run repository setup script
-  command: bash /tmp/script.{{ package_type }}.sh
-  changed_when: false
+  command: bash /tmp/tarantool-installer.sh --repo-only
+  environment:
+    VER: '{{ version }}'
   any_errors_fatal: true
+  changed_when: false

tasks/install_deb.yml

@@ -41,15 +41,14 @@
 # Get tarantool dependency <major>.<minor> version
 - name: Get tarantool dependency version
   set_fact:
-    tnt_version: "{{ deplist | regex_search('tarantool\\s+\\(\\s*>=\\s*([0-9]+).([0-9]+)', '\\1', '\\2') }}"
+    tnt_version: "{{ deplist | regex_search('tarantool\\s+\\(\\s*>=\\s*([0-9]+.[0-9]+)', '\\1') }}"
   when: cartridge_enable_tarantool_repo
   any_errors_fatal: true
 
 - name: Enable Tarantool repo
   include_tasks: enable_tarantool_repo.yml
   vars:
-    repository: 'tarantool/{{ tnt_version[0] }}_{{ tnt_version[1] }}'
-    package_type: deb
+    version: '{{ tnt_version[0] }}'
   when: '"tarantool" in deplist and cartridge_enable_tarantool_repo'
 
 - name: Install DEB

tasks/install_rpm.yml

@@ -45,15 +45,14 @@
 # Get tarantool dependency <major>.<minor> version
 - name: Get tarantool dependency version
   set_fact:
-    tnt_version: "{{ deplist.stdout | regex_search('tarantool >= ([0-9]+).([0-9]+)', '\\1', '\\2') }}"
+    tnt_version: "{{ deplist.stdout | regex_search('tarantool >= ([0-9]+.[0-9]+)', '\\1') }}"
   when: cartridge_enable_tarantool_repo
   any_errors_fatal: true
 
 - name: Enable Tarantool repo
   include_tasks: enable_tarantool_repo.yml
   vars:
-    repository: 'tarantool/{{ tnt_version[0] }}_{{ tnt_version[1] }}'
-    package_type: rpm
+    version: '{{ tnt_version[0] }}'
   when: 'cartridge_enable_tarantool_repo and "tarantool" in deplist.stdout'
 
 - name: Install RPM