From 4ed73788ddbec5d6276f7a6148cf242aa8b1793e Mon Sep 17 00:00:00 2001
From: Maarten de Waard <maarten@greenhost.nl>
Date: Mon, 15 Jul 2019 11:34:02 +0200
Subject: [PATCH] update dependency links to open.greenhost.net, update some
mentions of bootstrap to openappstack
---
.gitignore | 2 +-
.gitlab-ci.yml | 6 +++---
ansible/bootstrap.yml | 2 +-
ansible/roles/setup/tasks/helmfiles.yml | 6 +++---
helmfiles/README.md | 2 +-
helmfiles/helmfile.d/20-nextcloud.yaml | 2 +-
test/README.md | 2 +-
test/behave/README.md | 8 ++++----
8 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/.gitignore b/.gitignore
index 19b578d65..d223adc4c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,7 +15,7 @@
# Ignore files created during CI using test/ci-bootstrap.py
/test/group_vars/all/
-/test/inventory.yml
+/test/inventory*
/test/behave/behave.ini
/test/behave/rerun_failing.features
/test/cluster_data/
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e795f33a5..a4df171ef 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,7 +6,7 @@ stages:
- integration-test
- cleanup
-image: "${CI_REGISTRY_IMAGE}/bootstrap-ci:${CI_COMMIT_REF_NAME}"
+image: "${CI_REGISTRY_IMAGE}/openappstack-ci:${CI_COMMIT_REF_NAME}"
ci_test_image:
stage: build
@@ -19,8 +19,8 @@ ci_test_image:
- docker info
script:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- - docker build -t ${CI_REGISTRY_IMAGE}/bootstrap-ci:${CI_COMMIT_REF_NAME} test/
- - docker push ${CI_REGISTRY_IMAGE}/bootstrap-ci:${CI_COMMIT_REF_NAME}
+ - docker build -t ${CI_REGISTRY_IMAGE}/openappstack-ci:${CI_COMMIT_REF_NAME} test/
+ - docker push ${CI_REGISTRY_IMAGE}/openappstack-ci:${CI_COMMIT_REF_NAME}
only:
changes:
- test/Dockerfile
diff --git a/ansible/bootstrap.yml b/ansible/bootstrap.yml
index c25037964..373023b39 100644
--- a/ansible/bootstrap.yml
+++ b/ansible/bootstrap.yml
@@ -22,7 +22,7 @@
# mitogen fails installing the `openshift` python module as requirement
# for the `k8s` ansible resource, and using `k8s` in the same context.
# That's why we use the standard `linear` ansible strategy for this role.
- # See https://code.greenhost.net/openappstack/bootstrap/issues/102
+ # See https://open.greenhost.net/openappstack/openappstack/issues/102
strategy: linear
roles:
- role: configure
diff --git a/ansible/roles/setup/tasks/helmfiles.yml b/ansible/roles/setup/tasks/helmfiles.yml
index e4b137ae8..24ed7befb 100644
--- a/ansible/roles/setup/tasks/helmfiles.yml
+++ b/ansible/roles/setup/tasks/helmfiles.yml
@@ -22,7 +22,7 @@
tags:
- git
git:
- repo: 'https://code.greenhost.net/openappstack/charts'
+ repo: 'https://open.greenhost.net/openappstack/charts'
dest: '/oas/source/repos/charts'
version: '{{ git_charts_version }}'
@@ -30,7 +30,7 @@
tags:
- git
git:
- repo: 'https://code.greenhost.net/openappstack/nextcloud'
+ repo: 'https://open.greenhost.net/openappstack/nextcloud'
dest: '/oas/source/repos/nextcloud'
version: '{{ git_nextcloud_version }}'
@@ -38,7 +38,7 @@
tags:
- git
git:
- repo: 'https://code.greenhost.net/openappstack/local-storage'
+ repo: 'https://open.greenhost.net/openappstack/local-storage'
dest: '/oas/source/repos/local-storage'
version: '{{ git_local_storage_version }}'
diff --git a/helmfiles/README.md b/helmfiles/README.md
index 4388b5027..e50fbd6c9 100644
--- a/helmfiles/README.md
+++ b/helmfiles/README.md
@@ -37,7 +37,7 @@ Do these three steps to prepare the installation process:
1. You need to have a configuration file called `local.yaml` in the
following directory relative to this directory:
`../../../config/values/local.yaml`. Use our template at
- https://code.greenhost.net/openappstack/bootstrap/blob/master/ansible/roles/configure_helmfile/templates/local.yaml.j2
+ https://open.greenhost.net/openappstack/openappstack/blob/master/ansible/roles/configure_helmfile/templates/local.yaml.j2
and fill in the variables.
1. You need to set some environment variables:
diff --git a/helmfiles/helmfile.d/20-nextcloud.yaml b/helmfiles/helmfile.d/20-nextcloud.yaml
index a6f32401c..47be97939 100644
--- a/helmfiles/helmfile.d/20-nextcloud.yaml
+++ b/helmfiles/helmfile.d/20-nextcloud.yaml
@@ -6,7 +6,7 @@ environments:
# Note: needs helm-git plugin (https://github.com/aslafy-z/helm-git)
repositories:
- name: onlyoffice-documentserver
- url: git+https://code.greenhost.net/openappstack/nextcloud@onlyoffice-documentserver?ref=master
+ url: git+https://open.greenhost.net/openappstack/nextcloud@onlyoffice-documentserver?ref=master
diff --git a/test/README.md b/test/README.md
index 6ff653cee..21ceee2fa 100644
--- a/test/README.md
+++ b/test/README.md
@@ -35,7 +35,7 @@ or directly (allows better debugging since pytest won't eat stdout):
Export the following environment variables like this:
- export CI_REGISTRY_IMAGE='docker.greenhost.net/openappstack/bootstrap'
+ export CI_REGISTRY_IMAGE='open.greenhost.net:4567/openappstack/openappstack'
export SSH_PRIVATE_KEY="$(cat ~/.ssh/id_ed25519_oas_ci)"
export COSMOS_API_TOKEN='…'
diff --git a/test/behave/README.md b/test/behave/README.md
index add21b3c2..b15cd6a3f 100644
--- a/test/behave/README.md
+++ b/test/behave/README.md
@@ -15,12 +15,12 @@ For grafana test:
-t grafana
-# Run behave tests in bootstrap-ci docker image
+# Run behave tests in openappstack-ci docker image
- docker run --rm -it docker.greenhost.net/openappstack/bootstrap/bootstrap-ci sh
+ docker run --rm -it open.greenhost.net:4567/openappstack/openappstack/openappstack-ci sh
apk --no-cache add git
- git clone https://code.greenhost.net/openappstack/bootstrap.git
- cd bootstrap/test/behave
+ git clone https://open.greenhost.net/openappstack/openappstack.git
+ cd openappstack/test/behave
behave -D nextcloud.url=https://files.ci-20410.ci.openappstack.net \
-D nextcloud.admin.password=…
--
GitLab