Merge branch 'nik-dle-ansible-use-tag' into 'master'

DBLab ansible installer: Use Git tag for ansible repo

See merge request postgres-ai/database-lab!761

Author: NikolayS

ui/packages/platform/src/components/DbLabInstanceForm/utils/index.tsx

@@ -7,6 +7,8 @@ export const DEBUG_API_SERVER = 'https://v2.postgres.ai/api/general'
 
 export const availableTags = ['3.4.0-rc.7', '4.0.0-alpha.6']
 
+export const sePackageTag = 'v1.0-rc.5'
+
 export const dockerRunCommand = (provider: string) => {
   /* eslint-disable no-template-curly-in-string */
   switch (provider) {
@@ -29,7 +31,7 @@ export const getPlaybookCommand = (
   orgKey: string,
 ) =>
   `${dockerRunCommand(state.provider)} \\\r
-  postgresai/dle-se-ansible:v1.0-rc.4 \\\r
+  postgresai/dle-se-ansible:${sePackageTag} \\\r
     ansible-playbook deploy_dle.yml --extra-vars \\\r
     "provision='${state.provider}' \\\r
     server_name='${state.name}' \\\r

ui/packages/platform/src/components/DbLabInstanceInstallForm/utils/index.ts

@@ -1,25 +1,27 @@
 import { initialState } from '../reducer'
-import { DEBUG_API_SERVER } from 'components/DbLabInstanceForm/utils'
+import { sePackageTag, DEBUG_API_SERVER } from 'components/DbLabInstanceForm/utils'
 
 const API_SERVER = process.env.REACT_APP_API_SERVER
 
 export const getPlaybookCommand = (
   state: typeof initialState,
   orgKey: string,
 ) =>
-  `docker run --rm -it -v $HOME/.ssh:/root/.ssh:ro -e ANSIBLE_SSH_ARGS="-F none" postgresai/dle-se-ansible:v1.0-rc.3 \\\r
-  ansible-playbook deploy_dle.yml --extra-vars \\\r
-    "dle_host='user@server-ip-address' \\\r
-    dle_platform_project_name='${state.name}' \\\r
-    dle_version='${state.tag}' \\\r
-    ${orgKey ? `dle_platform_org_key='${orgKey}' \\\r` : ``}
-    ${
+  `docker run --rm -it \\\r
+    -v $HOME/.ssh:/root/.ssh:ro -e ANSIBLE_SSH_ARGS="-F none" \\\r
+    postgresai/dle-se-ansible:${sePackageTag} \\\r
+    ansible-playbook deploy_dle.yml --extra-vars \\\r
+      "dle_host='user@server-ip-address' \\\r
+      dle_platform_project_name='${state.name}' \\\r
+      dle_version='${state.tag}' \\\r
+      ${orgKey ? `dle_platform_org_key='${orgKey}' \\\r` : ``}
+      ${
       API_SERVER === DEBUG_API_SERVER
         ? `dle_platform_url='${DEBUG_API_SERVER}' \\\r`
         : ``
     }
-    ${state.publicKeys ? `ssh_public_keys='${state.publicKeys}' \\\r` : ``}
-    dle_verification_token='${state.verificationToken}'"
+      ${state.publicKeys ? `ssh_public_keys='${state.publicKeys}' \\\r` : ``}
+      dle_verification_token='${state.verificationToken}'"
 `
 
 export const getAnsiblePlaybookCommand = (
@@ -46,7 +48,6 @@ sudo apt install -y python3-pip
 pip3 install ansible`
 
 export const cloneRepositoryCommand = () =>
-  `git clone https://gitlab.com/postgres-ai/dle-se-ansible.git
-# Go to the playbook directory
-cd dle-se-ansible/
-`
+  `git clone --depth 1 --branch ${sePackageTag} \\
+    https://gitlab.com/postgres-ai/dle-se-ansible.git \\
+  && cd dle-se-ansible/`