Migrate devstack-plugin-container jobs to focal
As per victoria cycle testing runtime and community goal[1] we need to migrate upstream CI/CD to Ubuntu Focal(20.04). Tempest based jobs will be migrate automatically once devstack base job start running on Focal(Depends-On). This commit migrates devstack-plugin-container job to run on focal. Depends-On: https://review.opendev.org/#/c/734700 [1] https://governance.openstack.org/tc/goals/selected/victoria/migrate-ci-cd-jobs-to-ubuntu-focal.html Change-Id: I1a3ac070027805691fc1007458ac02567f847ae9
This commit is contained in:
parent
9620216b35
commit
74bf39e6a6
|
@ -18,7 +18,7 @@
|
||||||
- job:
|
- job:
|
||||||
name: devstack-plugin-container-k8s
|
name: devstack-plugin-container-k8s
|
||||||
parent: devstack-minimal
|
parent: devstack-minimal
|
||||||
nodeset: openstack-two-node-bionic
|
nodeset: openstack-two-node-focal
|
||||||
pre-run: playbooks/devstack-plugin-container-k8s/pre.yaml
|
pre-run: playbooks/devstack-plugin-container-k8s/pre.yaml
|
||||||
run: playbooks/devstack-plugin-container-k8s/run.yaml
|
run: playbooks/devstack-plugin-container-k8s/run.yaml
|
||||||
post-run: playbooks/devstack-plugin-container-k8s/post.yaml
|
post-run: playbooks/devstack-plugin-container-k8s/post.yaml
|
||||||
|
|
|
@ -27,7 +27,7 @@ K8S_NODE_IP=${K8S_NODE_IP:-$HOST_IP}
|
||||||
K8S_API_SERVER_PORT=${K8S_API_SERVER_PORT:-6443}
|
K8S_API_SERVER_PORT=${K8S_API_SERVER_PORT:-6443}
|
||||||
K8S_POD_NETWORK_CIDR=${K8S_POD_NETWORK_CIDR:-10.244.0.0/16}
|
K8S_POD_NETWORK_CIDR=${K8S_POD_NETWORK_CIDR:-10.244.0.0/16}
|
||||||
K8S_SERVICE_NETWORK_CIDR=${K8S_SERVICE_NETWORK_CIDR:-10.96.0.0/12}
|
K8S_SERVICE_NETWORK_CIDR=${K8S_SERVICE_NETWORK_CIDR:-10.96.0.0/12}
|
||||||
K8S_VERSION=${K8S_VERSION:-1.14.1-00}
|
K8S_VERSION=${K8S_VERSION:-1.19.0-00}
|
||||||
K8S_NETWORK_ADDON=${K8S_NETWORK_ADDON:-flannel}
|
K8S_NETWORK_ADDON=${K8S_NETWORK_ADDON:-flannel}
|
||||||
|
|
||||||
# Functions
|
# Functions
|
||||||
|
@ -60,7 +60,7 @@ function install_kubeadm {
|
||||||
function kubeadm_init {
|
function kubeadm_init {
|
||||||
local kubeadm_config_file
|
local kubeadm_config_file
|
||||||
kubeadm_config_file=$(mktemp)
|
kubeadm_config_file=$(mktemp)
|
||||||
cat <<EOF | sudo tee $kubeadm_config_file >/dev/null
|
cat <<EOF | tee $kubeadm_config_file >/dev/null
|
||||||
apiVersion: kubeadm.k8s.io/v1beta1
|
apiVersion: kubeadm.k8s.io/v1beta1
|
||||||
kind: ClusterConfiguration
|
kind: ClusterConfiguration
|
||||||
etcd:
|
etcd:
|
||||||
|
@ -92,14 +92,14 @@ EOF
|
||||||
safe_chown $STACK_USER:$STACK_USER $kube_config_file
|
safe_chown $STACK_USER:$STACK_USER $kube_config_file
|
||||||
|
|
||||||
if [[ "$K8S_NETWORK_ADDON" == "flannel" ]]; then
|
if [[ "$K8S_NETWORK_ADDON" == "flannel" ]]; then
|
||||||
kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/a70459be0084506e4ec919aa1c114638878db11b/Documentation/kube-flannel.yml
|
kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/4ff77dc7c35851913587f7daccf25d754e77aa65/Documentation/kube-flannel.yml
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function kubeadm_join {
|
function kubeadm_join {
|
||||||
local kubeadm_config_file
|
local kubeadm_config_file
|
||||||
kubeadm_config_file=$(mktemp)
|
kubeadm_config_file=$(mktemp)
|
||||||
cat <<EOF | sudo tee $kubeadm_config_file >/dev/null
|
cat <<EOF | tee $kubeadm_config_file >/dev/null
|
||||||
apiVersion: kubeadm.k8s.io/v1beta1
|
apiVersion: kubeadm.k8s.io/v1beta1
|
||||||
kind: JoinConfiguration
|
kind: JoinConfiguration
|
||||||
discovery:
|
discovery:
|
||||||
|
|
Loading…
Reference in New Issue