diff options
| -rw-r--r-- | container-dependency-versions/pom.xml | 6 | ||||
| -rw-r--r-- | hosted-tenant-base/pom.xml | 6 | ||||
| -rw-r--r-- | screwdriver.yaml | 7 | ||||
| -rwxr-xr-x | screwdriver/release-java-artifacts.sh | 25 | ||||
| -rwxr-xr-x | screwdriver/release-rpms.sh | 5 |
5 files changed, 38 insertions, 11 deletions
diff --git a/container-dependency-versions/pom.xml b/container-dependency-versions/pom.xml index a141535ef41..b82d8f3edd1 100644 --- a/container-dependency-versions/pom.xml +++ b/container-dependency-versions/pom.xml @@ -349,6 +349,12 @@ <goals> <goal>sign</goal> </goals> + <configuration> + <gpgArguments> + <arg>--pinentry-mode</arg> + <arg>loopback</arg> + </gpgArguments> + </configuration> </execution> </executions> </plugin> diff --git a/hosted-tenant-base/pom.xml b/hosted-tenant-base/pom.xml index 7a29ba88d46..696c76d96b5 100644 --- a/hosted-tenant-base/pom.xml +++ b/hosted-tenant-base/pom.xml @@ -353,6 +353,12 @@ <goals> <goal>sign</goal> </goals> + <configuration> + <gpgArguments> + <arg>--pinentry-mode</arg> + <arg>loopback</arg> + </gpgArguments> + </configuration> </execution> </executions> </plugin> diff --git a/screwdriver.yaml b/screwdriver.yaml index b23dfc50e70..937abc30613 100644 --- a/screwdriver.yaml +++ b/screwdriver.yaml @@ -183,6 +183,8 @@ jobs: - *save-cache publish-release: + image: docker.io/vespaengine/vespa-build-centos-stream8:latest + annotations: screwdriver.cd/cpu: 7 screwdriver.cd/ram: 16 @@ -216,10 +218,9 @@ jobs: exit 1 fi - install-dependencies: | - yum-config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo - yum install -y --setopt skip_missing_names_on_install=False docker-ce docker-ce-cli containerd.io rh-git227 + dnf config-manager --add-repo https://download.docker.com/linux/centos/docker-ce.repo + dnf install -y docker-ce docker-ce-cli containerd.io docker system info - source /opt/rh/rh-git227/enable - release-rpms: | screwdriver/release-rpms.sh $VESPA_VERSION $VESPA_REF - release-container-image: | diff --git a/screwdriver/release-java-artifacts.sh b/screwdriver/release-java-artifacts.sh index 3efa4360266..8030638cf5b 100755 --- a/screwdriver/release-java-artifacts.sh +++ b/screwdriver/release-java-artifacts.sh @@ -31,8 +31,12 @@ cd $VESPA_DIR git checkout $VESPA_REF mkdir -p $SD_SOURCE_DIR/screwdriver/deploy -openssl aes-256-cbc -pass pass:$GPG_ENCPHRASE -in $SD_SOURCE_DIR/screwdriver/pubring.gpg.enc -out $SD_SOURCE_DIR/screwdriver/deploy/pubring.gpg -d -openssl aes-256-cbc -pass pass:$GPG_ENCPHRASE -in $SD_SOURCE_DIR/screwdriver/secring.gpg.enc -out $SD_SOURCE_DIR/screwdriver/deploy/secring.gpg -d +# gpg-agent in RHEL 8 runs out of memory if we use Maven and sign in parallel. Add option to overcome this. +echo "auto-expand-secmem" >> $SD_SOURCE_DIR/screwdriver/deploy/gpg-agent.conf +openssl aes-256-cbc -md md5 -pass pass:$GPG_ENCPHRASE -in $SD_SOURCE_DIR/screwdriver/pubring.gpg.enc -out $SD_SOURCE_DIR/screwdriver/deploy/pubring.gpg -d +openssl aes-256-cbc -md md5 -pass pass:$GPG_ENCPHRASE -in $SD_SOURCE_DIR/screwdriver/secring.gpg.enc -out $SD_SOURCE_DIR/screwdriver/deploy/secring.gpg -d +chmod 700 $SD_SOURCE_DIR/screwdriver/deploy +chmod 600 $SD_SOURCE_DIR/screwdriver/deploy/* # Build the Java code with the correct version set find . -name "pom.xml" -exec sed -i'' -e "s,<version>.*SNAPSHOT.*</version>,<version>$VESPA_RELEASE</version>," \ @@ -48,9 +52,10 @@ for MODULE in $(comm -2 -3 \ echo "No javadoc available for module" > $MODULE/src/main/javadoc/README done +export VESPA_MAVEN_EXTRA_OPTS="--show-version --batch-mode" ./bootstrap.sh -COMMON_MAVEN_OPTS="--batch-mode --no-snapshot-updates --settings $(pwd)/screwdriver/settings-publish.xml --activate-profiles ossrh-deploy-vespa -DskipTests" +COMMON_MAVEN_OPTS="$VESPA_MAVEN_EXTRA_OPTS --no-snapshot-updates --settings $(pwd)/screwdriver/settings-publish.xml --activate-profiles ossrh-deploy-vespa -DskipTests" TMPFILE=$(mktemp) mvn $COMMON_MAVEN_OPTS -pl :container-dependency-versions -DskipStagingRepositoryClose=true deploy 2>&1 | tee $TMPFILE @@ -62,13 +67,21 @@ rm -f $TMPFILE mvn $COMMON_MAVEN_OPTS --file ./maven-plugins/pom.xml -DskipStagingRepositoryClose=true -DstagingRepositoryId=$STG_REPO deploy # Deploy the rest of the artifacts -mvn $COMMON_MAVEN_OPTS --threads 1C -DskipStagingRepositoryClose=true -DstagingRepositoryId=$STG_REPO deploy +mvn $COMMON_MAVEN_OPTS --threads 8 -DskipStagingRepositoryClose=true -DstagingRepositoryId=$STG_REPO deploy + +# Workaround for nexus-staging-maven-plugin:1.6.12:rc-release not working with maven+jdk17 +SWAP_MAVEN_JAVA_WORKAROUND=false +if rpm -q maven-openjdk17 &> /dev/null; then SWAP_MAVEN_JAVA_WORKAROUND=true; fi +if $SWAP_MAVEN_JAVA_WORKAROUND; then dnf swap -y maven-openjdk17 maven-openjdk11; fi # Close with checks -mvn $COMMON_MAVEN_OPTS -N org.sonatype.plugins:nexus-staging-maven-plugin:1.6.8:rc-close -DnexusUrl=https://oss.sonatype.org/ -DserverId=ossrh -DstagingRepositoryId=$STG_REPO +mvn $COMMON_MAVEN_OPTS -N org.sonatype.plugins:nexus-staging-maven-plugin:1.6.12:rc-close -DnexusUrl=https://oss.sonatype.org/ -DserverId=ossrh -DstagingRepositoryId=$STG_REPO # Release if ok -mvn $COMMON_MAVEN_OPTS -N org.sonatype.plugins:nexus-staging-maven-plugin:1.6.8:rc-release -DnexusUrl=https://oss.sonatype.org/ -DserverId=ossrh -DstagingRepositoryId=$STG_REPO +mvn $COMMON_MAVEN_OPTS -N org.sonatype.plugins:nexus-staging-maven-plugin:1.6.12:rc-release -DnexusUrl=https://oss.sonatype.org/ -DserverId=ossrh -DstagingRepositoryId=$STG_REPO + +# Swap back if we swapped previously +if $SWAP_MAVEN_JAVA_WORKAROUND; then dnf swap -y maven-openjdk11 maven-openjdk17; fi # Delete the GPG rings rm -rf $SD_SOURCE_DIR/screwdriver/deploy diff --git a/screwdriver/release-rpms.sh b/screwdriver/release-rpms.sh index 3346e0bef35..256bfd8c11a 100755 --- a/screwdriver/release-rpms.sh +++ b/screwdriver/release-rpms.sh @@ -12,7 +12,7 @@ fi readonly VESPA_RELEASE="$1" readonly VESPA_REF="$2" -VESPA_RPM=$(repoquery --repofrompath=vespa,https://copr-be.cloud.fedoraproject.org/results/@vespa/vespa/epel-7-x86_64 --repoid=vespa -q vespa | cut -d: -f2 | cut -d- -f1) +VESPA_RPM=$(dnf repoquery --repofrompath=vespa,https://copr-be.cloud.fedoraproject.org/results/@vespa/vespa/epel-7-x86_64 --repoid=vespa -q vespa | tail -1 | cut -d: -f2 | cut -d- -f1) echo "Latest RPM on Copr: $VESPA_RPM" if [ "$VESPA_RELEASE" == "$VESPA_RPM" ]; then @@ -32,7 +32,8 @@ cd vespa dist/release-vespa-rpm.sh $VESPA_RELEASE $VESPA_REF while [ "$VESPA_RELEASE" != "$VESPA_RPM" ]; do - VESPA_RPM=$(repoquery --repofrompath=vespa,https://copr-be.cloud.fedoraproject.org/results/@vespa/vespa/epel-7-x86_64 --repoid=vespa -q vespa | cut -d: -f2 | cut -d- -f1) + dnf clean --repofrompath=vespa,https://copr-be.cloud.fedoraproject.org/results/@vespa/vespa/epel-7-x86_64 --repoid=vespa metadata + VESPA_RPM=$(dnf repoquery --repofrompath=vespa,https://copr-be.cloud.fedoraproject.org/results/@vespa/vespa/epel-7-x86_64 --repoid=vespa -q vespa | tail -1 | cut -d: -f2 | cut -d- -f1) echo "RPM: $VESPA_RPM" sleep 150 done |