Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Prepare 2.346.3-2 LTS publication #1452

Merged
merged 3 commits into from
Aug 25, 2022
Merged

Prepare 2.346.3-2 LTS publication #1452

merged 3 commits into from
Aug 25, 2022

Conversation

dduportal
Copy link
Contributor

@dduportal dduportal commented Aug 25, 2022 •
edited
Loading

Depends on #1451 #1450 #1449 #1448 .

This PR allows to publish a new tag for the LTS image without requiring a full Jenkins LTS release for #1441.

The new tag will be 2.346.3-2 and will also update the "non version" tags such as lts-jdk11, etc.

Tested the publication script in dry run:

$ ./.ci/publish.sh -n     
Docker repository in Use:
* JENKINS_REPO: jenkins/jenkins
Dry run, will not publish images
Tag is already published: 2.346.1
Tag is already published: 2.346.2
Tag is already published: 2.346.3
WARNING: could not get a valid manifest at the URL https://index.docker.io/v2/jenkins/jenkins/manifests/2.346.3-2-almalinux.
  (For debugging purposes) manifest={"errors":[{"code":"MANIFEST_UNKNOWN","message":"manifest unknown","detail":"unknown tag=2.346.3-2-almalinux"}]}
2.346.3-2 not published yet
Version 2.346.3-2 higher than 1.0: publishing 2.346.3-2 latest_weekly:false latest_lts:true
DEBUG: COMMIT_SHA=7daeb5f3a914a491d4b843e7285a1451dc386fe9
DEBUG: MAIN_VERSION=2.346.3-2
DEBUG: jenkins_version=2.346.3
DEBUG: JENKINS_SHA=141e8c5890a31a5cf37a970ce3e15273c1c74d8759e4a5873bb5511c50b47d89
DEBUG: LATEST_WEEKLY=false
DEBUG: LATEST_LTS=true
====
INFO: Publishing the following tags:
docker.io/jenkins/jenkins:2.346.3-2-almalinux
docker.io/jenkins/jenkins:lts-almalinux
docker.io/jenkins/jenkins:2.346.3-2-alpine
docker.io/jenkins/jenkins:lts-alpine
docker.io/jenkins/jenkins:lts-alpine-jdk11
docker.io/jenkins/jenkins:2.346.3-2-lts-alpine
docker.io/jenkins/jenkins:2.346.3-2-alpine-jdk17-preview
docker.io/jenkins/jenkins:lts-alpine-jdk17-preview
docker.io/jenkins/jenkins:2.346.3-2-alpine-jdk17
docker.io/jenkins/jenkins:lts-alpine-jdk17
docker.io/jenkins/jenkins:2.346.3-2-alpine-jdk8
docker.io/jenkins/jenkins:lts-alpine-jdk8
docker.io/jenkins/jenkins:2.346.3-2-centos7
docker.io/jenkins/jenkins:2.346.3-2-lts-centos7
docker.io/jenkins/jenkins:lts-centos7
docker.io/jenkins/jenkins:lts-centos7-jdk11
docker.io/jenkins/jenkins:2.346.3-2-centos7-jdk8
docker.io/jenkins/jenkins:lts-centos7-jdk8
docker.io/jenkins/jenkins:2.346.3-2
docker.io/jenkins/jenkins:2.346.3-2-jdk11
docker.io/jenkins/jenkins:lts
docker.io/jenkins/jenkins:lts-jdk11
docker.io/jenkins/jenkins:2.346.3-2-lts
docker.io/jenkins/jenkins:2.346.3-2-lts-jdk11
docker.io/jenkins/jenkins:2.346.3-2-jdk17-preview
docker.io/jenkins/jenkins:lts-jdk17-preview
docker.io/jenkins/jenkins:2.346.3-2-lts-jdk17-preview
docker.io/jenkins/jenkins:2.346.3-2-jdk17
docker.io/jenkins/jenkins:lts-jdk17
docker.io/jenkins/jenkins:2.346.3-2-lts-jdk17
docker.io/jenkins/jenkins:2.346.3-2-jdk8
docker.io/jenkins/jenkins:lts-jdk8
docker.io/jenkins/jenkins:2.346.3-2-lts-jdk8
docker.io/jenkins/jenkins:2.346.3-2-slim
docker.io/jenkins/jenkins:lts-slim
docker.io/jenkins/jenkins:lts-slim-jdk11
docker.io/jenkins/jenkins:2.346.3-2-lts-slim
docker.io/jenkins/jenkins:2.346.3-2-slim-jdk17-preview
docker.io/jenkins/jenkins:lts-slim-jdk17-preview
docker.io/jenkins/jenkins:2.346.3-2-slim-jdk17
docker.io/jenkins/jenkins:lts-slim-jdk17
docker.io/jenkins/jenkins:2.346.3-2-slim-jdk8
docker.io/jenkins/jenkins:lts-slim-jdk8
docker.io/jenkins/jenkins:2.346.3-2-rhel-ubi8-jdk11
docker.io/jenkins/jenkins:lts-rhel-ubi8-jdk11
docker.io/jenkins/jenkins:2.346.3-2-lts-rhel-ubi8-jdk11
====
[+] Building 0.0s (0/0)                                                                                                                                          
{
  "group": {
    "default": {
      "targets": [
        "almalinux_jdk11",
        "alpine_jdk8",
        "alpine_jdk11",
        "alpine_jdk17",
        "centos7_jdk8",
        "centos7_jdk11",
        "debian_jdk8",
        "debian_jdk11",
        "debian_jdk17",
        "debian_slim_jdk8",
        "debian_slim_jdk11",
        "debian_slim_jdk17",
        "rhel_ubi8_jdk11"
      ]
    }
  },
  "target": {
    "almalinux_jdk11": {
      "context": ".",
      "dockerfile": "11/almalinux/almalinux8/hotspot/Dockerfile",
      "args": {
        "COMMIT_SHA": "7daeb5f3a914a491d4b843e7285a1451dc386fe9",
        "JENKINS_SHA": "141e8c5890a31a5cf37a970ce3e15273c1c74d8759e4a5873bb5511c50b47d89",
        "JENKINS_VERSION": "2.346.3",
        "PLUGIN_CLI_VERSION": "2.12.8"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.346.3-2-almalinux",
        "docker.io/jenkins/jenkins:lts-almalinux"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64"
      ]
    },
    "alpine_jdk11": {
      "context": ".",
      "dockerfile": "11/alpine/hotspot/Dockerfile",
      "args": {
        "COMMIT_SHA": "7daeb5f3a914a491d4b843e7285a1451dc386fe9",
        "JENKINS_SHA": "141e8c5890a31a5cf37a970ce3e15273c1c74d8759e4a5873bb5511c50b47d89",
        "JENKINS_VERSION": "2.346.3",
        "PLUGIN_CLI_VERSION": "2.12.8"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.346.3-2-alpine",
        "docker.io/jenkins/jenkins:lts-alpine",
        "docker.io/jenkins/jenkins:lts-alpine-jdk11",
        "docker.io/jenkins/jenkins:2.346.3-2-lts-alpine"
      ],
      "platforms": [
        "linux/amd64"
      ]
    },
    "alpine_jdk17": {
      "context": ".",
      "dockerfile": "17/alpine/hotspot/Dockerfile",
      "args": {
        "COMMIT_SHA": "7daeb5f3a914a491d4b843e7285a1451dc386fe9",
        "JENKINS_SHA": "141e8c5890a31a5cf37a970ce3e15273c1c74d8759e4a5873bb5511c50b47d89",
        "JENKINS_VERSION": "2.346.3",
        "PLUGIN_CLI_VERSION": "2.12.8"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.346.3-2-alpine-jdk17-preview",
        "docker.io/jenkins/jenkins:lts-alpine-jdk17-preview",
        "docker.io/jenkins/jenkins:2.346.3-2-alpine-jdk17",
        "docker.io/jenkins/jenkins:lts-alpine-jdk17"
      ],
      "platforms": [
        "linux/amd64"
      ]
    },
    "alpine_jdk8": {
      "context": ".",
      "dockerfile": "8/alpine/hotspot/Dockerfile",
      "args": {
        "COMMIT_SHA": "7daeb5f3a914a491d4b843e7285a1451dc386fe9",
        "JENKINS_SHA": "141e8c5890a31a5cf37a970ce3e15273c1c74d8759e4a5873bb5511c50b47d89",
        "JENKINS_VERSION": "2.346.3"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.346.3-2-alpine-jdk8",
        "docker.io/jenkins/jenkins:lts-alpine-jdk8"
      ],
      "platforms": [
        "linux/amd64"
      ]
    },
    "centos7_jdk11": {
      "context": ".",
      "dockerfile": "11/centos/centos7/hotspot/Dockerfile",
      "args": {
        "COMMIT_SHA": "7daeb5f3a914a491d4b843e7285a1451dc386fe9",
        "JENKINS_SHA": "141e8c5890a31a5cf37a970ce3e15273c1c74d8759e4a5873bb5511c50b47d89",
        "JENKINS_VERSION": "2.346.3",
        "PLUGIN_CLI_VERSION": "2.12.8"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.346.3-2-centos7",
        "docker.io/jenkins/jenkins:2.346.3-2-lts-centos7",
        "docker.io/jenkins/jenkins:lts-centos7",
        "docker.io/jenkins/jenkins:lts-centos7-jdk11"
      ],
      "platforms": [
        "linux/amd64"
      ]
    },
    "centos7_jdk8": {
      "context": ".",
      "dockerfile": "8/centos/centos7/hotspot/Dockerfile",
      "args": {
        "COMMIT_SHA": "7daeb5f3a914a491d4b843e7285a1451dc386fe9",
        "JENKINS_SHA": "141e8c5890a31a5cf37a970ce3e15273c1c74d8759e4a5873bb5511c50b47d89",
        "JENKINS_VERSION": "2.346.3"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.346.3-2-centos7-jdk8",
        "docker.io/jenkins/jenkins:lts-centos7-jdk8"
      ],
      "platforms": [
        "linux/amd64"
      ]
    },
    "debian_jdk11": {
      "context": ".",
      "dockerfile": "11/debian/bullseye/hotspot/Dockerfile",
      "args": {
        "COMMIT_SHA": "7daeb5f3a914a491d4b843e7285a1451dc386fe9",
        "JENKINS_SHA": "141e8c5890a31a5cf37a970ce3e15273c1c74d8759e4a5873bb5511c50b47d89",
        "JENKINS_VERSION": "2.346.3",
        "PLUGIN_CLI_VERSION": "2.12.8"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.346.3-2",
        "docker.io/jenkins/jenkins:2.346.3-2-jdk11",
        "docker.io/jenkins/jenkins:lts",
        "docker.io/jenkins/jenkins:lts-jdk11",
        "docker.io/jenkins/jenkins:2.346.3-2-lts",
        "docker.io/jenkins/jenkins:2.346.3-2-lts-jdk11"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64",
        "linux/s390x"
      ]
    },
    "debian_jdk17": {
      "context": ".",
      "dockerfile": "17/debian/bullseye/hotspot/Dockerfile",
      "args": {
        "COMMIT_SHA": "7daeb5f3a914a491d4b843e7285a1451dc386fe9",
        "JENKINS_SHA": "141e8c5890a31a5cf37a970ce3e15273c1c74d8759e4a5873bb5511c50b47d89",
        "JENKINS_VERSION": "2.346.3",
        "PLUGIN_CLI_VERSION": "2.12.8"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.346.3-2-jdk17-preview",
        "docker.io/jenkins/jenkins:lts-jdk17-preview",
        "docker.io/jenkins/jenkins:2.346.3-2-lts-jdk17-preview",
        "docker.io/jenkins/jenkins:2.346.3-2-jdk17",
        "docker.io/jenkins/jenkins:lts-jdk17",
        "docker.io/jenkins/jenkins:2.346.3-2-lts-jdk17"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64"
      ]
    },
    "debian_jdk8": {
      "context": ".",
      "dockerfile": "8/debian/bullseye/hotspot/Dockerfile",
      "args": {
        "COMMIT_SHA": "7daeb5f3a914a491d4b843e7285a1451dc386fe9",
        "JENKINS_SHA": "141e8c5890a31a5cf37a970ce3e15273c1c74d8759e4a5873bb5511c50b47d89",
        "JENKINS_VERSION": "2.346.3"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.346.3-2-jdk8",
        "docker.io/jenkins/jenkins:lts-jdk8",
        "docker.io/jenkins/jenkins:2.346.3-2-lts-jdk8"
      ],
      "platforms": [
        "linux/amd64"
      ]
    },
    "debian_slim_jdk11": {
      "context": ".",
      "dockerfile": "11/debian/bullseye-slim/hotspot/Dockerfile",
      "args": {
        "COMMIT_SHA": "7daeb5f3a914a491d4b843e7285a1451dc386fe9",
        "JENKINS_SHA": "141e8c5890a31a5cf37a970ce3e15273c1c74d8759e4a5873bb5511c50b47d89",
        "JENKINS_VERSION": "2.346.3",
        "PLUGIN_CLI_VERSION": "2.12.8"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.346.3-2-slim",
        "docker.io/jenkins/jenkins:lts-slim",
        "docker.io/jenkins/jenkins:lts-slim-jdk11",
        "docker.io/jenkins/jenkins:2.346.3-2-lts-slim"
      ],
      "platforms": [
        "linux/amd64"
      ]
    },
    "debian_slim_jdk17": {
      "context": ".",
      "dockerfile": "17/debian/bullseye-slim/hotspot/Dockerfile",
      "args": {
        "COMMIT_SHA": "7daeb5f3a914a491d4b843e7285a1451dc386fe9",
        "JENKINS_SHA": "141e8c5890a31a5cf37a970ce3e15273c1c74d8759e4a5873bb5511c50b47d89",
        "JENKINS_VERSION": "2.346.3",
        "PLUGIN_CLI_VERSION": "2.12.8"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.346.3-2-slim-jdk17-preview",
        "docker.io/jenkins/jenkins:lts-slim-jdk17-preview",
        "docker.io/jenkins/jenkins:2.346.3-2-slim-jdk17",
        "docker.io/jenkins/jenkins:lts-slim-jdk17"
      ],
      "platforms": [
        "linux/amd64"
      ]
    },
    "debian_slim_jdk8": {
      "context": ".",
      "dockerfile": "8/debian/bullseye-slim/hotspot/Dockerfile",
      "args": {
        "COMMIT_SHA": "7daeb5f3a914a491d4b843e7285a1451dc386fe9",
        "JENKINS_SHA": "141e8c5890a31a5cf37a970ce3e15273c1c74d8759e4a5873bb5511c50b47d89",
        "JENKINS_VERSION": "2.346.3"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.346.3-2-slim-jdk8",
        "docker.io/jenkins/jenkins:lts-slim-jdk8"
      ],
      "platforms": [
        "linux/amd64"
      ]
    },
    "rhel_ubi8_jdk11": {
      "context": ".",
      "dockerfile": "11/rhel/ubi8/hotspot/Dockerfile",
      "args": {
        "COMMIT_SHA": "7daeb5f3a914a491d4b843e7285a1451dc386fe9",
        "JENKINS_SHA": "141e8c5890a31a5cf37a970ce3e15273c1c74d8759e4a5873bb5511c50b47d89",
        "JENKINS_VERSION": "2.346.3",
        "PLUGIN_CLI_VERSION": "2.12.8"
      },
      "tags": [
        "docker.io/jenkins/jenkins:2.346.3-2-rhel-ubi8-jdk11",
        "docker.io/jenkins/jenkins:lts-rhel-ubi8-jdk11",
        "docker.io/jenkins/jenkins:2.346.3-2-lts-rhel-ubi8-jdk11"
      ],
      "platforms": [
        "linux/amd64",
        "linux/arm64"
      ]
    }
  }
}

@dduportal dduportal changed the title Feat/allow lts package bump Prepare 2.346.3-2 LTS publication Aug 25, 2022
@dduportal dduportal mentioned this pull request Aug 25, 2022
Closed
@dduportal dduportal force-pushed the feat/allow-lts-package-bump branch from 7daeb5f to 4a8c4d0 Compare August 25, 2022 11:41
@dduportal
feat: allow publishing new tags with additional package suffix
3f5d23e 
Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
@dduportal
add a new 2.346.3-2 version to publish as per jenkinsci#1441
b686e4a 
Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
@dduportal dduportal force-pushed the feat/allow-lts-package-bump branch from 4a8c4d0 to b686e4a Compare August 25, 2022 11:56
@dduportal dduportal marked this pull request as ready for review August 25, 2022 11:56
@dduportal dduportal requested a review from a team as a code owner August 25, 2022 11:56
MarkEWaite
MarkEWaite approved these changes Aug 25, 2022
View reviewed changes
Copy link
Contributor

@MarkEWaite MarkEWaite left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This looks good to me.

As far as I can tell, this also means that if this change is also merged (in the future) to the master branch, then future releases like 2.361.1 will have their initial release tagged as 2.361.1-1 rather than being tagged as 2.361.1. Did I understand that correctly? If that's correct, I assume we may want to note that in the upgrade guide and in the changelog for the 2.361.1 release.

@dduportal
Copy link
Contributor Author

This looks good to me.

As far as I can tell, this also means that if this change is also merged (in the future) to the master branch, then future releases like 2.361.1 will have their initial release tagged as 2.361.1-1 rather than being tagged as 2.361.1. Did I understand that correctly? If that's correct, I assume we may want to note that in the upgrade guide and in the changelog for the 2.361.1 release.

That would be the proposal yes, to be discussed and approved/refused on a subsequent issue, ideally prior to forking the master branch.

Please note that the change here is a short term hack dedicated to the 2.346 line

@dduportal
fixup: specify the latest SHA version
0e2ac66 
Signed-off-by: Damien Duportal <damien.duportal@gmail.com>
@dduportal dduportal merged commit 4c18c51 into jenkinsci:stable-2.346 Aug 25, 2022
@dduportal dduportal deleted the feat/allow-lts-package-bump branch August 25, 2022 13:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@MarkEWaite MarkEWaite MarkEWaite approved these changes

@timja timja timja approved these changes

@basil basil Awaiting requested review from basil

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@dduportal @MarkEWaite @timja