Skip to content

Commit

Permalink
ci: move keycloak+aio+csi jobs to zuul (#1043)
Browse files Browse the repository at this point in the history
Signed-off-by: Mohammed Naser <[email protected]>
  • Loading branch information
mnaser authored Apr 2, 2024
1 parent 03ddc8e commit dc08739
Show file tree
Hide file tree
Showing 21 changed files with 256 additions and 281 deletions.
74 changes: 0 additions & 74 deletions .github/workflows/csi.yml

This file was deleted.

46 changes: 0 additions & 46 deletions .github/workflows/keycloak.yml

This file was deleted.

54 changes: 0 additions & 54 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -127,60 +127,6 @@ pipeline {
}
}

stage('integration') {
matrix {
axes {
axis {
name 'NETWORK_BACKEND'
values 'openvswitch', 'ovn'
}
}

agent {
label 'jammy-16c-64g'
}

environment {
ATMOSPHERE_DEBUG = "true"
ATMOSPHERE_NETWORK_BACKEND = "${NETWORK_BACKEND}"

// NOTE(mnaser): OVN is currently unstable and we don't want it to mark builds as failed.
BUILD_RESULT_ON_FAILURE = "${NETWORK_BACKEND == 'ovn' ? 'SUCCESS' : 'FAILURE'}"
STAGE_RESULT_ON_FAILURE = "${NETWORK_BACKEND == 'ovn' ? 'UNSTABLE' : 'FAILURE'}"
}

stages {
stage('molecule') {
steps {
// Checkout code with built/pinned images
unstash 'src-with-pinned-images'

// Install dependencies
sh 'sudo apt-get install -y git python3-pip'
sh 'sudo pip install poetry'
sh 'sudo poetry install --with dev'

catchError(buildResult: "${BUILD_RESULT_ON_FAILURE}", stageResult: "${STAGE_RESULT_ON_FAILURE}") {
sh 'sudo --preserve-env=ATMOSPHERE_DEBUG,ATMOSPHERE_NETWORK_BACKEND poetry run molecule test -s aio'
}
}
}
}

post {
always {
// Kubernetes logs
sh "sudo ./build/fetch-kubernetes-logs.sh logs/${NETWORK_BACKEND}/kubernetes || true"
archiveArtifacts artifacts: 'logs/**', allowEmptyArchive: true

// JUnit results for Tempest
sh "sudo ./build/fetch-junit-xml.sh tempest-${NETWORK_BACKEND}.xml || true"
junit "tempest-${NETWORK_BACKEND}.xml"
}
}
}
}

// promote images
// release?
// todo: manual pin commit to main (avoiding loop)
Expand Down
78 changes: 0 additions & 78 deletions build/fetch-kubernetes-logs.sh

This file was deleted.

2 changes: 1 addition & 1 deletion galaxy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ dependencies:
kubernetes.core: 2.4.0
openstack.cloud: 1.7.0
vexxhost.ceph: 3.0.1
vexxhost.kubernetes: ">=1.13.2"
vexxhost.kubernetes: ">=1.13.4"
tags:
- application
- cloud
Expand Down
2 changes: 1 addition & 1 deletion molecule/aio/group_vars/all/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ cilium_helm_values:
operator:
replicas: 1

csi_driver: local-path-provisioner
csi_driver: "{{ lookup('env', 'MOLECULE_CSI_DRIVER') | default('local-path-provisioner', True) }}"

cluster_issuer_type: self-signed

Expand Down
12 changes: 10 additions & 2 deletions molecule/csi/converge.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright (c) 2023 VEXXHOST, Inc.
# Copyright (c) 2024 VEXXHOST, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
Expand All @@ -12,4 +12,12 @@
# License for the specific language governing permissions and limitations
# under the License.

- ansible.builtin.import_playbook: vexxhost.atmosphere.csi
- name: Install Ceph
ansible.builtin.import_playbook: vexxhost.atmosphere.ceph
when: csi_driver == 'rbd'

- name: Install Kubernetes
ansible.builtin.import_playbook: vexxhost.atmosphere.kubernetes

- name: Install CSI
ansible.builtin.import_playbook: vexxhost.atmosphere.csi
1 change: 1 addition & 0 deletions molecule/csi/create.yml
1 change: 1 addition & 0 deletions molecule/csi/group_vars
1 change: 1 addition & 0 deletions molecule/csi/host_vars
2 changes: 1 addition & 1 deletion molecule/csi/molecule.yml
17 changes: 0 additions & 17 deletions molecule/csi/prepare.yml

This file was deleted.

1 change: 1 addition & 0 deletions molecule/csi/prepare.yml
40 changes: 40 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
[tox]
minversion = 4
skipsdist = True

[testenv:molecule]
deps =
molecule
molecule-plugins[docker]
# TODO(mnaser): We should remove these once we have an actual installable
# Python package and drop `skipsdist`.
docker-image-py
jmespath
netaddr
openstacksdk<0.99.0
rjsonnet

[testenv:molecule-keycloak]
deps =
{[testenv:molecule]deps}
commands =
molecule test -s keycloak

[testenv:molecule-csi-{rbd,local-path-provisioner}]
deps =
{[testenv:molecule]deps}
setenv =
rbd: MOLECULE_CSI_DRIVER = rbd
local-path-provisioner: MOLECULE_CSI_DRIVER = local-path-provisioner
commands =
molecule test -s csi

[testenv:molecule-aio-{openvswitch,ovn}]
deps =
{[testenv:molecule]deps}
setenv =
ATMOSPHERE_DEBUG = true
openvswitch: ATMOSPHERE_NETWORK_BACKEND = openvswitch
ovn: ATMOSPHERE_NETWORK_BACKEND = ovn
commands =
molecule test -s aio
Loading

0 comments on commit dc08739

Please sign in to comment.