Merge branch '551-ui-add-tag-3-5-0' into 'master'

agneum · agneum · commit 509566cd1d32 · 2023-11-01T15:48:29.000Z
chore(ui): add tag 3.5.0 (after the release) to SE installer", rename the image tag "Generic Postgres" for version 16, add the tag '0.4.2' for the "Generic Postgres" image

Closes #551

See merge request postgres-ai/database-lab!831
diff --git a/ui/.gitlab-ci.yml b/ui/.gitlab-ci.yml
@@ -10,7 +10,7 @@ include:
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH'
 
 .ui_cache: &ui_cache
-  image: node:lts-alpine
+  image: node:21.1.0-alpine
   cache: &cache
     key: "$CI_COMMIT_REF_SLUG"
     paths:
@@ -23,8 +23,9 @@ check-code-style:
   <<: *ui_cache
   stage: test
   before_script:
-    - apk add --no-cache curl
-    - curl -f https://get.pnpm.io/v6.16.js | node - add --global pnpm@7
+    - corepack enable
+    - corepack prepare pnpm@8.9.2 --activate
+    - export PNPM_HOME=/usr/local/bin
     - pnpm config set store-dir /builds/postgres-ai/database-lab/.pnpm-store/
 
   script:
@@ -59,15 +60,17 @@ semgrep-sast:
 
 e2e-ce-ui-test:
   <<: *ui_checks
-  <<: *ui_cache
-  image: node:latest
+  image: node:21.1.0
   stage: integration-test
+  variables:
+    CYPRESS_CACHE_FOLDER: '$CI_PROJECT_DIR/cache/Cypress'
   before_script:
     - apt update && apt install curl
     - apt install -y libgtk2.0-0 libgtk-3-0 libgbm-dev libnotify-dev libgconf-2-4 libnss3 libxss1 libasound2 libxtst6 xauth xvfb
     - npm install -g wait-on
     - npm install -g pnpm
-    - pnpm config set store-dir /builds/postgres-ai/database-lab/.pnpm-store/
+    # TODO: Set up caching.
+#    - pnpm config set store-dir /builds/postgres-ai/database-lab/.pnpm-store/
   script:
     - pnpm --dir ui/ i --no-frozen-lockfile
     - pnpm --dir ui/ --filter @postgres.ai/ce start & wait-on http://localhost:3001
diff --git a/ui/packages/platform/src/components/DbLabInstanceForm/utils/index.tsx b/ui/packages/platform/src/components/DbLabInstanceForm/utils/index.tsx
@@ -5,9 +5,9 @@ import { initialState } from '../reducer'
 const API_SERVER = process.env.REACT_APP_API_SERVER
 export const DEBUG_API_SERVER = 'https://v2.postgres.ai/api/general'
 
-export const availableTags = ['3.4.0', '4.0.0-alpha.6']
+export const availableTags = ['3.5.0', '3.4.0', '4.0.0-alpha.6']
 
-export const sePackageTag = 'v1.0-rc.9'
+export const sePackageTag = 'v1.0-rc.10'
 
 export const dockerRunCommand = (provider: string) => {
   /* eslint-disable no-template-curly-in-string */
@@ -50,9 +50,17 @@ export const getPlaybookCommand = (
       volume_size='${state.storage}' \\\r
       dblab_engine_verification_token='${state.verificationToken}' \\\r
       dblab_engine_version='${state.tag}' \\\r
-      ${ state.snapshots > 1 ? `zpool_datasets_number='${state.snapshots}' \\\r` : `` }
-      ${ orgKey ? `platform_org_key='${orgKey}' \\\r` : `` }
-      ${ API_SERVER === DEBUG_API_SERVER ? `platform_url='${DEBUG_API_SERVER}' \\\r` : `` }
+      ${
+        state.snapshots > 1
+          ? `zpool_datasets_number='${state.snapshots}' \\\r`
+          : ``
+      }
+      ${orgKey ? `platform_org_key='${orgKey}' \\\r` : ``}
+      ${
+        API_SERVER === DEBUG_API_SERVER
+          ? `platform_url='${DEBUG_API_SERVER}' \\\r`
+          : ``
+      }
       ${state.publicKeys ? `ssh_public_keys='${state.publicKeys}' \\\r` : ``}
       platform_project_name='${state.name}'"`
 
diff --git a/ui/packages/shared/pages/Configuration/utils/index.ts b/ui/packages/shared/pages/Configuration/utils/index.ts
@@ -5,9 +5,29 @@ import { FormValues } from '../useForm'
 
 const seContainerRegistry = 'se-images'
 const genericImagePrefix = 'postgresai/extended-postgres'
+// since some tags are rc, we need to specify the exact tags to use
+const dockerImagesConfig = {
+  '9.6': ['0.4.2', '0.4.1', '0.3.0'],
+  '10': ['0.4.2', '0.4.1', '0.3.0'],
+  '11': ['0.4.2', '0.4.1', '0.3.0'],
+  '12': ['0.4.2', '0.4.1', '0.3.0'],
+  '13': ['0.4.2', '0.4.1', '0.3.0'],
+  '14': ['0.4.2', '0.4.1', '0.3.0'],
+  '15': ['0.4.2', '0.4.1', '0.3.0'],
+  '16': ['0.4.2', '0.4.1'],
+}
 
 export type FormValuesKey = keyof FormValues
 
+interface DockerImage {
+  package_group: string
+  pg_major_version: string
+  tag: string
+  location: string
+}
+
+type DockerImagesConfig = Record<string, string[]>
+
 export const uniqueChipValue = (values: string) => {
   const splitChipArray = values.split(/[,(\s)(\n)(\r)(\t)(\r\n)]/)
   let databaseArray = []
@@ -39,106 +59,32 @@ export const postUniqueDatabases = (values: string) => {
   return values.length !== 0 ? nonEmptyDatabase : null
 }
 
+const createDockerImages = (
+  dockerImagesConfig: DockerImagesConfig,
+): DockerImage[] => {
+  const dockerImages: DockerImage[] = []
+
+  for (const pg_major_version in dockerImagesConfig) {
+    if (dockerImagesConfig.hasOwnProperty(pg_major_version)) {
+      const customTags = dockerImagesConfig[pg_major_version]
+
+      customTags.forEach((tag) => {
+        const image: DockerImage = {
+          package_group: 'postgresai',
+          pg_major_version,
+          tag: `${pg_major_version}-${tag}`,
+          location: `${genericImagePrefix}:${pg_major_version}-${tag}`,
+        }
+
+        dockerImages.push(image)
+      })
+    }
+  }
+
+  return dockerImages
+}
 
-// using the same json data structue as se-images
-export const genericDockerImages = [
-  {
-    package_group: 'postgresai',
-    pg_major_version: '9.6',
-    tag: '9.6-0.4.1',
-    location: `${genericImagePrefix}:9.6-0.4.1`,
-  },
-  {
-    package_group: 'postgresai',
-    pg_major_version: '9.6',
-    tag: '9.6-0.3.0',
-    location: `${genericImagePrefix}:9.6-0.3.0`,
-  },
-  {
-    package_group: 'postgresai',
-    pg_major_version: '10',
-    tag: '10-0.4.1',
-    location: `${genericImagePrefix}:10-0.4.1`,
-  },
-  {
-    package_group: 'postgresai',
-    pg_major_version: '10',
-    tag: '10-0.3.0',
-    location: `${genericImagePrefix}:10-0.3.0`,
-  },
-  {
-    package_group: 'postgresai',
-    pg_major_version: '11',
-    tag: '11-0.4.1',
-    location: `${genericImagePrefix}:11-0.4.1`,
-  },
-  {
-    package_group: 'postgresai',
-    pg_major_version: '11',
-    tag: '11-0.3.0',
-    location: `${genericImagePrefix}:11-0.3.0`,
-  },
-  {
-    package_group: 'postgresai',
-    pg_major_version: '12',
-    tag: '12-0.4.1',
-    location: `${genericImagePrefix}:12-0.4.1`,
-  },
-  {
-    package_group: 'postgresai',
-    pg_major_version: '12',
-    tag: '12-0.3.0',
-    location: `${genericImagePrefix}:12-0.3.0`,
-  },
-  {
-    package_group: 'postgresai',
-    pg_major_version: '13',
-    tag: '13-0.4.1',
-    location: `${genericImagePrefix}:13-0.4.1`,
-  },
-  {
-    package_group: 'postgresai',
-    pg_major_version: '13',
-    tag: '13-0.3.0',
-    location: `${genericImagePrefix}:13-0.3.0`,
-  },
-  {
-    package_group: 'postgresai',
-    pg_major_version: '14',
-    tag: '14-0.4.1',
-    location: `${genericImagePrefix}:14-0.4.1`,
-  },
-  {
-    package_group: 'postgresai',
-    pg_major_version: '14',
-    tag: '14-0.3.0',
-    location: `${genericImagePrefix}:14-0.3.0`,
-  },
-  {
-    package_group: 'postgresai',
-    pg_major_version: '15',
-    tag: '15-0.4.1',
-    location: `${genericImagePrefix}:15-0.4.1`,
-  },
-  {
-    package_group: 'postgresai',
-    pg_major_version: '15',
-    tag: '15-0.3.0',
-    location: `${genericImagePrefix}:15-0.3.0`,
-  },
-  {
-    package_group: 'postgresai',
-    pg_major_version: '16',
-    tag: '16rc1-0.4.1',
-    location: `${genericImagePrefix}:16rc1-0.4.1`,
-  },
-  {
-    package_group: 'postgresai',
-    pg_major_version: '16',
-    tag: '16-0.3.0',
-    location: `${genericImagePrefix}:16-0.3.0`,
-  },
-]
+export const genericDockerImages = createDockerImages(dockerImagesConfig)
 
 export const isSeDockerImage = (dockerImage: string | undefined) => {
   const dockerImageType =
diff --git a/ui/pnpm-lock.yaml b/ui/pnpm-lock.yaml
