From af4bf814f3a44e9ccee7c9fd8e4be34d943e013d Mon Sep 17 00:00:00 2001 From: Sergiy Markin Date: Thu, 19 Dec 2024 20:28:51 +0000 Subject: [PATCH] Updated base image docker repo url Change-Id: Ief92f0f97531a694690b824fd21d94426909269f --- images/armada/Dockerfile.ubuntu_jammy | 2 +- tools/gate/playbooks/airskiff-deploy.yaml | 152 ---------------------- 2 files changed, 1 insertion(+), 153 deletions(-) delete mode 100644 tools/gate/playbooks/airskiff-deploy.yaml diff --git a/images/armada/Dockerfile.ubuntu_jammy b/images/armada/Dockerfile.ubuntu_jammy index e2001d6..d86e6bc 100644 --- a/images/armada/Dockerfile.ubuntu_jammy +++ b/images/armada/Dockerfile.ubuntu_jammy @@ -4,7 +4,7 @@ # 429 Too Many Requests - Server message: too many requests: # You have reached your pull rate limit. # You may increase the limit by authenticating and upgrading: https://www.docker.com/increase-rate-limit -ARG FROM=public.ecr.aws/ubuntu/ubuntu:jammy +ARG FROM=public.ecr.aws/docker/library/ubuntu:jammy ARG ARMADA_GO=quay.io/airshipit/armada-go:latest-ubuntu_focal FROM ${ARMADA_GO} AS armada_go FROM ${FROM} diff --git a/tools/gate/playbooks/airskiff-deploy.yaml b/tools/gate/playbooks/airskiff-deploy.yaml deleted file mode 100644 index 2331a88..0000000 --- a/tools/gate/playbooks/airskiff-deploy.yaml +++ /dev/null @@ -1,152 +0,0 @@ -# Copyright 2019, AT&T Intellectual Property -# -# 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 a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -- hosts: primary - roles: - - clear-firewall - - bindep - - disable-systemd-resolved - - ensure-python - - ensure-pip - - ensure-docker - - tasks: - - - name: Install Packaging python module for airship - block: - - pip: - name: packaging - executable: pip3 - become: True - - - name: Clone Required Repositories - shell: | - export CLONE_ARMADA={{ CLONE_ARMADA }} - export OSH_INFRA_COMMIT={{ OSH_INFRA_COMMIT }} - export OSH_COMMIT={{ OSH_COMMIT }} - ./tools/deployment/airskiff/developer/000-clone-dependencies.sh - args: - chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - - - name: Setup Apparmor - shell: | - ./tools/deployment/airskiff/developer/009-setup-apparmor.sh - args: - chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - - - name: Deploy Kubernetes with Minikube - shell: | - set -ex - sudo fdisk --list - df -h - sudo mkdir -p /opt/ext_vol - BIG_VOLUME=$(sudo fdisk -l 2>&1 | grep -E 80G | grep Linux | awk '{print $1}') - if ! mount | grep "${BIG_VOLUME}" - then - sudo mkfs.ext4 "${BIG_VOLUME}" - sudo mount "${BIG_VOLUME}" /opt/ext_vol - df -h - fi - ./tools/deployment/airskiff/developer/010-deploy-k8s.sh - args: - chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - - - name: Setup openstack client - shell: | - ./tools/deployment/airskiff/developer/020-setup-client.sh - args: - chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - become: yes - - - name: Build Armada with submitted changes - shell: | - set -ex - export DISTRO={{ ARMADA_IMAGE_DISTRO }} - make images - docker system prune --force - args: - chdir: "{{ zuul.project.src_dir }}" - become: yes - - - - name: Use locally built images in manifests - shell: | - set -ex - export DISTRO={{ ARMADA_IMAGE_DISTRO }} - docker rm registry --force || true - docker run -d -p 5000:5000 --restart=always --name registry registry:2 - if test "${DISTRO}" = 'ubuntu_bionic' - then - docker tag quay.io/airshipit/armada:latest-ubuntu_bionic localhost:5000/armada:latest-ubuntu_bionic - docker push localhost:5000/armada:latest-ubuntu_bionic - sed -i "s#quay.io/airshipit/armada:latest-ubuntu_focal#localhost:5000/armada:latest-ubuntu_bionic#g" ./site/airskiff/software/config/versions.yaml - sed -i "s#quay.io/airshipit/armada:latest-ubuntu_focal#localhost:5000/armada:latest-ubuntu_bionic#g" ./tools/deployment/airskiff/developer/030-armada-bootstrap.sh - sed -i "s#quay.io/airshipit/armada:latest-ubuntu_focal#localhost:5000/armada:latest-ubuntu_bionic#g" ./global/software/config/versions.yaml - else - docker tag quay.io/airshipit/armada:latest-ubuntu_focal localhost:5000/armada:latest-ubuntu_focal - docker push localhost:5000/armada:latest-ubuntu_focal - sed -i "s#quay.io/airshipit/armada:latest-ubuntu_focal#localhost:5000/armada:latest-ubuntu_focal#g" ./site/airskiff/software/config/versions.yaml - sed -i "s#quay.io/airshipit/armada:latest-ubuntu_focal#localhost:5000/armada:latest-ubuntu_focal#g" ./tools/deployment/airskiff/developer/030-armada-bootstrap.sh - sed -i "s#quay.io/airshipit/armada:latest-ubuntu_focal#localhost:5000/armada:latest-ubuntu_focal#g" ./global/software/config/versions.yaml - fi - args: - chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - become: yes - - - name: Build all charts locally - shell: | - set -ex - export HELM_ARTIFACT_URL={{ HELM_ARTIFACT_URL }} - export HTK_COMMIT={{ HTK_COMMIT }} - ./tools/deployment/airskiff/developer/015-make-all-charts.sh - args: - chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - become: yes - - - - name: Start artifactory - shell: | - set -ex - # start http server with artifacts - docker rm artifacts --force || true - docker run --name artifacts -p 8282:80 -v $(pwd)/../artifacts:/usr/share/nginx/html -d nginx - sleep 10 - curl --verbose -I http://control-plane.minikube.internal:8282/memcached.tgz - args: - chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - become: yes - - - name: Deploy Airship components using Armada - shell: | - set -x - mkdir -p ~/.kube - cp -rp /home/zuul/.kube/config ~/.kube/config - ./tools/deployment/airskiff/developer/030-armada-bootstrap.sh - args: - chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - become: yes - - - name: Deploy Memcached using Airship - shell: | - ./tools/deployment/airskiff/developer/100-deploy-osh.sh - args: - chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - become: yes - - - name: Wait for deployment completion - shell: | - ./tools/gate/wait-for-shipyard.sh - args: - chdir: "{{ zuul.projects['opendev.org/airship/treasuremap'].src_dir }}" - become: yes