diff options
Diffstat (limited to 'ansible_collections/community/okd/ci')
| -rw-r--r-- | ansible_collections/community/okd/ci/Dockerfile | 20 | ||||
| -rwxr-xr-x | ansible_collections/community/okd/ci/downstream.sh | 11 |
2 files changed, 16 insertions, 15 deletions
diff --git a/ansible_collections/community/okd/ci/Dockerfile b/ansible_collections/community/okd/ci/Dockerfile index 1a509190d..d57e7a007 100644 --- a/ansible_collections/community/okd/ci/Dockerfile +++ b/ansible_collections/community/okd/ci/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.access.redhat.com/ubi8/ubi +FROM registry.access.redhat.com/ubi9/ubi ENV OPERATOR=/usr/local/bin/ansible-operator \ USER_UID=1001 \ @@ -11,20 +11,20 @@ RUN yum install -y \ glibc-langpack-en \ git \ make \ - python39 \ - python39-devel \ - python39-pip \ - python39-setuptools \ + python3 \ + python3-devel \ + python3-pip \ + python3-setuptools \ gcc \ openldap-devel \ - && pip3 install --no-cache-dir --upgrade setuptools pip \ - && pip3 install --no-cache-dir \ + && python3.9 -m pip install --no-cache-dir --upgrade setuptools pip \ + && python3.9 -m pip install --no-cache-dir \ kubernetes \ - ansible==2.9.* \ - "molecule<3.3.0" \ + "ansible-core" \ + "molecule" \ && yum clean all \ && rm -rf $HOME/.cache \ - && curl -L https://github.com/openshift/okd/releases/download/4.5.0-0.okd-2020-08-12-020541/openshift-client-linux-4.5.0-0.okd-2020-08-12-020541.tar.gz | tar -xz -C /usr/local/bin + && curl -L https://github.com/openshift/okd/releases/download/4.12.0-0.okd-2023-04-16-041331/openshift-client-linux-4.12.0-0.okd-2023-04-16-041331.tar.gz | tar -xz -C /usr/local/bin # TODO: Is there a better way to install this client in ubi8? COPY . /opt/ansible diff --git a/ansible_collections/community/okd/ci/downstream.sh b/ansible_collections/community/okd/ci/downstream.sh index 001959c7e..c75398b77 100755 --- a/ansible_collections/community/okd/ci/downstream.sh +++ b/ansible_collections/community/okd/ci/downstream.sh @@ -9,7 +9,7 @@ # - All functions are prefixed with f_ so it's obvious where they come # from when in use throughout the script -DOWNSTREAM_VERSION="2.3.0" +DOWNSTREAM_VERSION="3.0.1" KEEP_DOWNSTREAM_TMPDIR="${KEEP_DOWNSTREAM_TMPDIR:-''}" INSTALL_DOWNSTREAM_COLLECTION_PATH="${INSTALL_DOWNSTREAM_COLLECTION_PATH:-}" _build_dir="" @@ -47,7 +47,7 @@ f_text_sub() sed -i.bak "s/Kubernetes/OpenShift/g" "${_build_dir}/galaxy.yml" sed -i.bak "s/^version\:.*$/version: ${DOWNSTREAM_VERSION}/" "${_build_dir}/galaxy.yml" sed -i.bak "/STARTREMOVE/,/ENDREMOVE/d" "${_build_dir}/README.md" - sed -i.bak "s/[[:space:]]okd:$/ openshift:/" ${_build_dir}/meta/runtime.yml + sed -i.bak "s/[[:space:]]okd:$/ openshift:/" "${_build_dir}/meta/runtime.yml" find "${_build_dir}" -type f ! -name galaxy.yml -exec sed -i.bak "s/community\.okd/redhat\.openshift/g" {} \; find "${_build_dir}" -type f -name "*.bak" -delete @@ -62,12 +62,12 @@ f_prep() # Files to copy downstream (relative repo root dir path) _file_manifest=( + .gitignore CHANGELOG.rst galaxy.yml LICENSE README.md Makefile - setup.cfg .yamllint requirements.txt requirements.yml @@ -76,6 +76,7 @@ f_prep() # Directories to recursively copy downstream (relative repo root dir path) _dir_manifest=( + .config changelogs ci meta @@ -145,7 +146,7 @@ f_handle_doc_fragments_workaround() local rendered_fragments="./rendereddocfragments.txt" # FIXME: Check Python interpreter from environment variable to work with prow - PYTHON=${DOWNSTREAM_BUILD_PYTHON:-/usr/bin/python3.6} + PYTHON=${DOWNSTREAM_BUILD_PYTHON:-/usr/bin/python3} f_log_info "Using Python interpreter: ${PYTHON}" # Modules with inherited doc fragments from kubernetes.core that need @@ -156,7 +157,7 @@ f_handle_doc_fragments_workaround() # Build the collection, export docs, render them, stitch it all back together pushd "${_build_dir}" || return ansible-galaxy collection build - ansible-galaxy collection install -p "${install_collections_dir}" ./*.tar.gz + ansible-galaxy collection install --force-with-deps -p "${install_collections_dir}" ./*.tar.gz rm ./*.tar.gz for doc_fragment_mod in "${_doc_fragment_modules[@]}" do |