From ca9379b3ea79f0f8e1f665147c063556aecb2bf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Wed, 18 Sep 2024 11:06:42 +0300 Subject: [PATCH] Get out of ubuntu 22 image building EF provided 24.04 is used in smoke tests. --- .github/dependabot.yml | 5 ----- .../dockerfiles/build-ubuntu-22.04.sh | 21 ------------------- .../dockerfiles/buildDockerImages.sh | 5 ----- .../dockerfiles/push-ubuntu-22.04.sh | 18 ---------------- .../dockerfiles/pushDockerImages.sh | 1 - 5 files changed, 50 deletions(-) delete mode 100755 cje-production/dockerfiles/build-ubuntu-22.04.sh delete mode 100644 cje-production/dockerfiles/push-ubuntu-22.04.sh diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8e26f129aaf..583d155f178 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -42,11 +42,6 @@ updates: schedule: interval: daily - - package-ecosystem: docker - directory: /cje-production/dockerfiles/ubuntu-gtk3-metacity/22.04-gtk3 - schedule: - interval: daily - - package-ecosystem: maven directory: / schedule: diff --git a/cje-production/dockerfiles/build-ubuntu-22.04.sh b/cje-production/dockerfiles/build-ubuntu-22.04.sh deleted file mode 100755 index c1e6496a71b..00000000000 --- a/cje-production/dockerfiles/build-ubuntu-22.04.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -x -#******************************************************************************* -# Copyright (c) 2022 IBM Corporation and others. -# -# This program and the accompanying materials -# are made available under the terms of the Eclipse Public License 2.0 -# which accompanies this distribution, and is available at -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Sravan Kumar Lakkimsetti - initial API and implementation -#******************************************************************************* - -set -e - -pushd ubuntu-gtk3-metacity/22.04-gtk3 -echo "Building Ubuntu 22.04 docker image" -docker build --pull -t eclipse/platformreleng-ubuntu-gtk3-metacity:22.04 . -popd diff --git a/cje-production/dockerfiles/buildDockerImages.sh b/cje-production/dockerfiles/buildDockerImages.sh index a849390f9dd..9c634d51bf9 100755 --- a/cje-production/dockerfiles/buildDockerImages.sh +++ b/cje-production/dockerfiles/buildDockerImages.sh @@ -24,8 +24,3 @@ pushd centos-gtk3-metacity/8-gtk3 echo "Building Centos 8 docker image" docker build --pull -t eclipse/platformreleng-centos-gtk3-metacity:8 . popd - -pushd ubuntu-gtk3-metacity/22.04-gtk3 -echo "Building Ubuntu 22.04 docker image" -docker build --pull -t eclipse/platformreleng-ubuntu-gtk3-metacity:22.04 . -popd diff --git a/cje-production/dockerfiles/push-ubuntu-22.04.sh b/cje-production/dockerfiles/push-ubuntu-22.04.sh deleted file mode 100644 index 06a32d538b4..00000000000 --- a/cje-production/dockerfiles/push-ubuntu-22.04.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash -x -#******************************************************************************* -# Copyright (c) 2022 IBM Corporation and others. -# -# This program and the accompanying materials -# are made available under the terms of the Eclipse Public License 2.0 -# which accompanies this distribution, and is available at -# https://www.eclipse.org/legal/epl-2.0/ -# -# SPDX-License-Identifier: EPL-2.0 -# -# Contributors: -# Sravan Kumar Lakkimsetti - initial API and implementation -#******************************************************************************* - -set -e - -docker push eclipse/platformreleng-ubuntu-gtk3-metacity:22.04 diff --git a/cje-production/dockerfiles/pushDockerImages.sh b/cje-production/dockerfiles/pushDockerImages.sh index c3fc1744e94..6eaab58a56a 100755 --- a/cje-production/dockerfiles/pushDockerImages.sh +++ b/cje-production/dockerfiles/pushDockerImages.sh @@ -17,4 +17,3 @@ set -e docker push eclipse/platformreleng-centos-gtk3-metacity:8 docker push eclipse/platformreleng-centos-swt-build:8 -docker push eclipse/platformreleng-ubuntu-gtk3-metacity:22.04