Commit 587153e3 authored by Cédric OLIVIER's avatar Cédric OLIVIER
Browse files

Merge branch 'feat/component' into 'master'

feat: migrate to CI/CD component

See merge request to-be-continuous/ansible!55
parents 1e8e8ab3 9ff8c781
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ include:
    file: '/templates/validation.yml'
  - project: 'to-be-continuous/bash'
    ref: '3.3'
    file: 'templates/gitlab-ci-bash.yml'
    file: '/templates/gitlab-ci-bash.yml'
  - project: 'to-be-continuous/semantic-release'
    ref: '3.7'
    file: '/templates/gitlab-ci-semrel.yml'
+159 −157

File changed.

Preview size limit exceeded, changes collapsed.

+2 −2
Original line number Diff line number Diff line
@@ -27,13 +27,13 @@ if [[ "$curVer" ]]; then
  log_info "Bump version from \\e[33;1m${curVer}\\e[0m to \\e[33;1m${nextVer}\\e[0m (release type: $relType)..."

  # replace in README
  sed -e "s/ref: '$curVer'/ref: '$nextVer'/" README.md > README.md.next
  sed -e "s/ref: *'$curVer'/ref: '$nextVer'/" -e "s/ref: *\"$curVer\”/ref: \”$nextVer\”/" -e "s/component: *\(.*\)@$curVer/component: \1@$nextVer/" README.md > README.md.next
  mv -f README.md.next README.md

  # replace in template and variants
  for tmpl in templates/*.yml
  do
    sed -e "s/\"$curVer\"/\"$nextVer\"/" "$tmpl" > "$tmpl.next"
    sed -e "s/command: *\[\"--service\", \"\(.*\)\", \"$curVer\"\]/command: [\"--service\", \"\1\", \"$nextVer\"]/" "$tmpl" > "$tmpl.next"
    mv -f "$tmpl.next" "$tmpl"
  done
else
+59 −84
Original line number Diff line number Diff line
@@ -3,6 +3,8 @@
  "description": "Provision your infrastructure and deploy your application with [Ansible](https://www.ansible.com/)",
  "template_path": "templates/gitlab-ci-ansible.yml",
  "kind": "hosting",
  "prefix": "ansible",
  "is_component": true,
  "variables": [
    {
      "name": "ANSIBLE_IMAGE",
@@ -113,7 +115,7 @@
      "variables": [
        {
          "name": "ANSIBLE_REVIEW_APP_NAME",
          "description": "The application name for review env (only define if different from global)",
          "description": "The application name for review env (only define to override default)",
          "advanced": true
        },
        {
@@ -124,13 +126,11 @@
        },
        {
          "name": "ANSIBLE_REVIEW_INVENTORY",
          "description": "The inventory for `review` env",
          "default": "$ANSIBLE_DEFAULT_INVENTORY"
          "description": "The inventory for `review` env (only define to override default)"
        },
        {
          "name": "ANSIBLE_REVIEW_TAGS",
          "description": "The tags for `review` env",
          "default": "$ANSIBLE_DEFAULT_TAGS"
          "description": "The tags for `review` env (only define to override default)"
        },
        {
          "name": "ANSIBLE_REVIEW_CLEANUP_TAGS",
@@ -139,9 +139,8 @@
        },
        {
          "name": "ANSIBLE_REVIEW_EXTRA_ARGS",
          "description": "The command line extra args for `review` env",
          "advanced": true,
          "default": "$ANSIBLE_DEFAULT_EXTRA_ARGS"
          "description": "The command line extra args for `review` env (only define to override default)",
          "advanced": true
        },
        {
          "name": "ANSIBLE_REVIEW_AUTOSTOP_DURATION",
@@ -155,28 +154,24 @@
        },
        {
          "name": "ANSIBLE_REVIEW_CLEANUP_PLAYBOOK_FILE",
          "description": " The playbook filename to cleanup `review` env",
          "advanced": true,
          "default": "$ANSIBLE_REVIEW_PLAYBOOK_FILE"
          "description": "The playbook filename to cleanup `review` env (only define if different from deployment playbook)",
          "advanced": true
        },
        {
          "name": "ANSIBLE_REVIEW_PRIVATE_KEY",
          "description": "The SSH private key to be use in `review` env",
          "secret": true,
          "default": "$ANSIBLE_PRIVATE_KEY"
          "description": "The SSH private key to be use in `review` env (only define to override default)",
          "secret": true
        },
        {
          "name": "ANSIBLE_REVIEW_PUBLIC_KEY",
          "description": "The SSH public key associated to the private key to be use in `review` env",
          "advanced": true,
          "default": "$ANSIBLE_PUBLIC_KEY"
          "description": "The SSH public key associated to the private key to be use in `review` env (only define to override default)",
          "advanced": true
        },
        {
          "name": "ANSIBLE_REVIEW_VAULT_PASSWORD",
          "description": "The Ansible vault password for `review` env",
          "description": "The Ansible vault password for `review` env (only define to override default)",
          "secret": true,
          "advanced": true,
          "default": "$ANSIBLE_VAULT_PASSWORD"
          "advanced": true
        }
      ]
    },
@@ -187,7 +182,7 @@
      "variables": [
        {
          "name": "ANSIBLE_INTEG_APP_NAME",
          "description": "The application name for integration env (only define if different from global)",
          "description": "The application name for integration env (only define to override default)",
          "advanced": true
        },
        {
@@ -203,13 +198,11 @@
        },
        {
          "name": "ANSIBLE_INTEG_INVENTORY",
          "description": "The inventory for `integration` env",
          "default": "$ANSIBLE_DEFAULT_INVENTORY"
          "description": "The inventory for `integration` env (only define to override default)"
        },
        {
          "name": "ANSIBLE_INTEG_TAGS",
          "description": "The tags for `integration` env",
          "default": "$ANSIBLE_DEFAULT_TAGS"
          "description": "The tags for `integration` env (only define to override default)"
        },
        {
          "name": "ANSIBLE_INTEG_CLEANUP_TAGS",
@@ -218,9 +211,8 @@
        },
        {
          "name": "ANSIBLE_INTEG_EXTRA_ARGS",
          "description": "The command line extra args for `integration` env",
          "advanced": true,
          "default": "$ANSIBLE_DEFAULT_EXTRA_ARGS"
          "description": "The command line extra args for `integration` env (only define to override default)",
          "advanced": true
        },
        {
          "name": "ANSIBLE_INTEG_PLAYBOOK_FILE",
@@ -229,29 +221,25 @@
        },
        {
          "name": "ANSIBLE_INTEG_CLEANUP_PLAYBOOK_FILE",
          "description": " The playbook filename to cleanup `integration` env",
          "advanced": true,
          "default": "$ANSIBLE_INTEG_PLAYBOOK_FILE"
          "description": "The playbook filename to cleanup `integration` env (only define if different from deployment playbook)",
          "advanced": true
        },
        {
          "name": "ANSIBLE_INTEG_PRIVATE_KEY",
          "description": "The SSH private key to be use in `integration` env",
          "description": "The SSH private key to be use in `integration` env (only define to override default)",
          "secret": true,
          "advanced": true,
          "default": "$ANSIBLE_PRIVATE_KEY"
          "advanced": true
        },
        {
          "name": "ANSIBLE_INTEG_PUBLIC_KEY",
          "description": "The SSH public key associated to the private key to be use in `integration` env",
          "advanced": true,
          "default": "$ANSIBLE_PUBLIC_KEY"
          "description": "The SSH public key associated to the private key to be use in `integration` env (only define to override default)",
          "advanced": true
        },
        {
          "name": "ANSIBLE_INTEG_VAULT_PASSWORD",
          "description": "The Ansible vault password for `integration` env",
          "description": "The Ansible vault password for `integration` env (only define to override default)",
          "secret": true,
          "advanced": true,
          "default": "$ANSIBLE_VAULT_PASSWORD"
          "advanced": true
        }
      ]
    },
@@ -262,7 +250,7 @@
      "variables": [
        {
          "name": "ANSIBLE_STAGING_APP_NAME",
          "description": "The application name for staging env (only define if different from global)",
          "description": "The application name for staging env (only define to override default)",
          "advanced": true
        },
        {
@@ -278,13 +266,11 @@
        },
        {
          "name": "ANSIBLE_STAGING_INVENTORY",
          "description": "The inventory for `staging` env",
          "default": "$ANSIBLE_DEFAULT_INVENTORY"
          "description": "The inventory for `staging` env (only define to override default)"
        },
        {
          "name": "ANSIBLE_STAGING_TAGS",
          "description": "The tags for `staging` env",
          "default": "$ANSIBLE_DEFAULT_TAGS"
          "description": "The tags for `staging` env (only define to override default)"
        },
        {
          "name": "ANSIBLE_STAGING_CLEANUP_TAGS",
@@ -293,9 +279,8 @@
        },
        {
          "name": "ANSIBLE_STAGING_EXTRA_ARGS",
          "description": "The command line extra args for `staging` env",
          "advanced": true,
          "default": "$ANSIBLE_DEFAULT_EXTRA_ARGS"
          "description": "The command line extra args for `staging` env (only define to override default)",
          "advanced": true
        },
        {
          "name": "ANSIBLE_STAGING_PLAYBOOK_FILE",
@@ -304,29 +289,25 @@
        },
        {
          "name": "ANSIBLE_STAGING_CLEANUP_PLAYBOOK_FILE",
          "description": " The playbook filename to cleanup `staging` env",
          "advanced": true,
          "default": "$ANSIBLE_STAGING_PLAYBOOK_FILE"
          "description": "The playbook filename to cleanup `staging` env (only define if different from deployment playbook)",
          "advanced": true
        },
        {
          "name": "ANSIBLE_STAGING_PRIVATE_KEY",
          "description": "The SSH private key to be use in `staging` env",
          "description": "The SSH private key to be use in `staging` env (only define to override default)",
          "secret": true,
          "advanced": true,
          "default": "$ANSIBLE_PRIVATE_KEY"
          "advanced": true
        },
        {
          "name": "ANSIBLE_STAGING_PUBLIC_KEY",
          "description": "The SSH public key associated to the private key to be use in `staging` env",
          "advanced": true,
          "default": "$ANSIBLE_PUBLIC_KEY"
          "description": "The SSH public key associated to the private key to be use in `staging` env (only define to override default)",
          "advanced": true
        },
        {
          "name": "ANSIBLE_STAGING_VAULT_PASSWORD",
          "description": "The Ansible vault password for `staging` env",
          "description": "The Ansible vault password for `staging` env (only define to override default)",
          "secret": true,
          "advanced": true,
          "default": "$ANSIBLE_VAULT_PASSWORD"
          "advanced": true
        }
      ]
    },
@@ -337,7 +318,7 @@
      "variables": [
        {
          "name": "ANSIBLE_PROD_APP_NAME",
          "description": "The application name for production env (only define if different from global)",
          "description": "The application name for production env (only define to override default)",
          "advanced": true
        },
        {
@@ -355,19 +336,16 @@
        },
        {
          "name": "ANSIBLE_PROD_INVENTORY",
          "description": "The inventory for `production` env",
          "default": "$ANSIBLE_DEFAULT_INVENTORY"
          "description": "The inventory for `production` env (only define to override default)"
        },
        {
          "name": "ANSIBLE_PROD_TAGS",
          "description": "The tags for `production` env",
          "default": "$ANSIBLE_DEFAULT_TAGS"
          "description": "The tags for `production` env (only define to override default)"
        },
        {
          "name": "ANSIBLE_PROD_EXTRA_ARGS",
          "description": "The command line extra args for `production` env",
          "advanced": true,
          "default": "$ANSIBLE_DEFAULT_EXTRA_ARGS"
          "description": "The command line extra args for `production` env (only define to override default)",
          "advanced": true
        },
        {
          "name": "ANSIBLE_PROD_PLAYBOOK_FILE",
@@ -376,23 +354,20 @@
        },
        {
          "name": "ANSIBLE_PROD_PRIVATE_KEY",
          "description": "The SSH private key to be use in `production` env",
          "description": "The SSH private key to be use in `production` env (only define to override default)",
          "secret": true,
          "advanced": true,
          "default": "$ANSIBLE_PRIVATE_KEY"
          "advanced": true
        },
        {
          "name": "ANSIBLE_PROD_PUBLIC_KEY",
          "description": "The SSH public key associated to the private key to be use in `production` env",
          "advanced": true,
          "default": "$ANSIBLE_PUBLIC_KEY"
          "description": "The SSH public key associated to the private key to be use in `production` env (only define to override default)",
          "advanced": true
        },
        {
          "name": "ANSIBLE_PROD_VAULT_PASSWORD",
          "description": "The Ansible vault password for `production` env",
          "description": "The Ansible vault password for `production` env (only define to override default)",
          "secret": true,
          "advanced": true,
          "default": "$ANSIBLE_VAULT_PASSWORD"
          "advanced": true
        }
      ]
    }
−2.19 KiB (15.2 KiB)
Loading image diff...
Loading